diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 589e2a3f55c..a28fc430caa 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 ( "7.0.0", "6.0.5", "5.0.7" );
+return ( "9.0.0", "8.0.3", "7.0.4", "6.0.8", "5.0.7" );
 }
 
 sub script_dolibarr_release
@@ -263,15 +263,16 @@ if ($upgrade) {
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
+			  [ "installlock", "444" ],
 			 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory.
-	local $dinstall = "$opts->{'dir'}/install";
-	$dinstall  =~ s/\/$//;
-	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	# Remove the installation directory. (deprecated)
+	# local $dinstall = "$opts->{'dir'}/install";
+	# $dinstall  =~ s/\/$//;
+	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	
 	}
 else {
@@ -306,15 +307,18 @@ else {
 			  [ "login", "admin" ],
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
+			  [ "installlock", "444" ],
 	 		 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory and protect config file.
-	local $dinstall = "$opts->{'dir'}/install";
-	$dinstall  =~ s/\/$//;
-	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	# Remove the installation directory (deprecated)
+	# local $dinstall = "$opts->{'dir'}/install";
+	# $dinstall  =~ s/\/$//;
+	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	
+	# Protect config file
 	&set_permissions_as_domain_user($d, 0644, $cfile);
 	&set_permissions_as_domain_user($d, 0755, $cfiledir);
 	}
@@ -386,6 +390,8 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
+				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
+				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 7.0 ? "dolibarr\\-(7\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 6.0 ? "dolibarr\\-(6\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 347c29fc30d..b77759b98a3 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1286,8 +1286,11 @@ else
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
-			foreach ($cats as $cat) {
-				$arrayselected[] = $cat->id;
+			$arrayselected = array();
+			if (is_array($cats)) {
+				foreach ($cats as $cat) {
+					$arrayselected[] = $cat->id;
+				}
 			}
 			print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
 			print "</td></tr>";
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 39d31986511..cee9ce36edd 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -59,6 +59,9 @@ class Adherent extends CommonObject
 
 	public $mesgs;
 
+    /**
+     * @var string login of member
+     */
 	public $login;
 
 	//! Clear password in memory
@@ -68,29 +71,70 @@ class Adherent extends CommonObject
 	//! Encrypted password in database (always defined)
 	public $pass_indatabase_crypted;
 
+    /**
+     * @var string company name
+     * @deprecated
+     */
 	public $societe;
 
 	/**
-	 * @var Societe $company {@type Societe}
+	 * @var string company name
 	 */
 	public $company;
 
+	/**
+	 * @var int Thirdparty ID
+	 */
+    public $fk_soc;
+
 	/**
 	 * @var string Address
 	 */
 	public $address;
 
-	public $zip;
+    /**
+     * @var string zipcode
+     */
+    public $zip;
+
+    /**
+     * @var string town
+     */
 	public $town;
 
-	public $state_id;              // Id of department
-	public $state_code;            // Code of department
-	public $state;                 // Label of department
+    /**
+     * @var int Id of state
+     */
+    public $state_id;
 
+    /**
+     * @var string Code of state
+     */
+    public $state_code;
+
+    /**
+     * @var string Label of state
+     */
+	public $state;
+
+    /**
+     * @var string email
+     */
 	public $email;
 
-	public $skype;
-	public $twitter;
+    /**
+     * @var string skype account
+     */
+    public $skype;
+
+    /**
+     * @var string twitter account
+     */
+    public $twitter;
+
+    /**
+     * @var string facebook account
+     */
 	public $facebook;
 
     /**
@@ -120,8 +164,12 @@ class Adherent extends CommonObject
 
 	public $morphy;
 	public $public;
-	public $statut;			// -1:brouillon, 0:resilie, >=1:valide,paye
-	public $photo;
+
+    // -1:brouillon, 0:resilie, >=1:valide,paye
+    // def in common object
+    //public $statut;
+
+    public $photo;
 
 	public $datec;
 	public $datem;
@@ -129,21 +177,20 @@ class Adherent extends CommonObject
 
 	public $birth;
 
-	public $note_public;
-	public $note_private;
+    /**
+     * @var int id type member
+     */
+	public $typeid;
 
-	public $typeid;			// Id type adherent
-	public $type;				// Libelle type adherent
+    /**
+     * @var string label type member
+     */
+	public $type;
 	public $need_subscription;
 
 	public $user_id;
 	public $user_login;
 
-	/**
-	 * @var int Thirdparty ID
-	 */
-    public $fk_soc;
-
 	public $datefin;	// From member table
 
 	// Fields loaded by fetch_subscriptions()
@@ -155,7 +202,10 @@ class Adherent extends CommonObject
 	public $last_subscription_amount;
 	public $subscriptions=array();
 
-	public $oldcopy;		// To contains a clone of this when we need to save old properties of object
+    /**
+     * @var Adherent To contains a clone of this when we need to save old properties of object
+     */
+	public $oldcopy;
 
 	/**
 	 * @var int Entity
@@ -593,11 +643,11 @@ class Adherent extends CommonObject
 						$luser->societe_id=$this->societe;
 
 						$luser->birth=$this->birth;
-                                                $luser->address=$this->address;
-                                                $luser->zip=$this->zip;
-                                                $luser->town=$this->town;
-                                                $luser->country_id=$this->country_id;
-                                                $luser->state_id=$this->state_id;
+                        $luser->address=$this->address;
+                        $luser->zip=$this->zip;
+                        $luser->town=$this->town;
+                        $luser->country_id=$this->country_id;
+                        $luser->state_id=$this->state_id;
 
 						$luser->email=$this->email;
 						$luser->skype=$this->skype;
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 497d4748da8..031e4200268 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -397,7 +397,7 @@ print '<br><br>';
  */
 //if (! empty($conf->global->MAIN_FEATURES_LEVEL))
 //{
-print load_fiche_titre($langs->trans("BankAccountReleveModule"), '', '');
+print load_fiche_titre($langs->trans("Other"), '', '');
 
 
 print "<table class=\"noborder\" width=\"100%\">\n";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 431d93e2a96..6cf9c84d265 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -63,7 +63,7 @@ if ($action == 'setcoder')
 	$resql=$db->query($sqlp);
 	if (! $resql) dol_print_error($db);
 }
-else if ($action == 'update')
+elseif ($action == 'update')
 {
 	$location = GETPOST('GENBARCODE_LOCATION','alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_LOCATION",$location,'chaine',0,'',$conf->entity);
@@ -71,17 +71,8 @@ else if ($action == 'update')
 	$res = dolibarr_set_const($db, "PRODUIT_DEFAULT_BARCODE_TYPE", $coder_id,'chaine',0,'',$conf->entity);
 	$coder_id = GETPOST('GENBARCODE_BARCODETYPE_THIRDPARTY','alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id,'chaine',0,'',$conf->entity);
-}
-else if ($action == 'updateengine')
-{
-    // TODO Update engines.
-}
 
-if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
-{
-	if (! $res > 0) $error++;
-
- 	if (! $error)
+	if ($res > 0)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
@@ -90,6 +81,42 @@ if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
+elseif ($action == 'updateengine')
+{
+    $sql = "SELECT rowid, coder";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+    $sql.= " WHERE entity = ".$conf->entity;
+    $sql.= " ORDER BY code";
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+	   $num = $db->num_rows($resql);
+	   $i = 0;
+
+	   while ($i <	$num)
+	   {
+	       $obj = $db->fetch_object($resql);
+
+	       if (GETPOST('coder'.$obj->rowid, 'alpha'))
+	       {
+	           $coder = GETPOST('coder'.$obj->rowid,'alpha');
+	           $code_id = $obj->rowid;
+
+	           $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
+	           $sqlp.= " SET coder = '" . $coder."'";
+	           $sqlp.= " WHERE rowid = ". $code_id;
+	           $sqlp.= " AND entity = ".$conf->entity;
+
+	           $upsql=$db->query($sqlp);
+	           if (! $upsql) dol_print_error($db);
+	       }
+
+	       $i++;
+	   }
+    }
+}
+
 
 /*
  * View
@@ -161,9 +188,12 @@ foreach($dirbarcode as $reldir)
 print '<br>';
 print load_fiche_titre($langs->trans("BarcodeEncodeModule"),'','');
 
-//print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-//print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-//print "<input type=\"hidden\" name=\"action\" value=\"updateengine\">";
+if (empty($conf->use_javascript_ajax))
+{
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" id="form_engine">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="updateengine">';
+}
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -258,10 +288,9 @@ print "</table>\n";
 
 if (empty($conf->use_javascript_ajax))
 {
-    // TODO Implement code behind action updateengine
-    //print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
+    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
+    print '</form>';
 }
-//print '</form>';
 
 print "<br>";
 
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 945656962ea..a9068544e35 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -995,7 +996,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print '<td>';
 			if (! empty($conf->global->MAIN_MULTILANGS))
 			{
-				$selectedlang = GETPOSTISSET('langcode','aZ09')?GETPOST('langcode','aZ09'):$langs->defaultlang;
+				$selectedlang = GETPOSTISSET('langcode')?GETPOST('langcode', 'aZ09'):$langs->defaultlang;
 				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
 			}
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 3c242e8048f..55be556afb9 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -517,7 +517,6 @@ print '<br>';
 <input type="hidden" name="export_type" value="server" />
 
 <fieldset><legend class="legendforfieldsetstep" style="font-size: 3em">2</legend>
-<div class="fichehalfleft">
 
 <?php
 print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>';
@@ -525,6 +524,13 @@ print $langs->trans("BackupDescX").'<br><br>';
 
 ?>
 
+<div id="backupfilesleft" class="fichehalfleft">
+
+<?php
+
+print load_fiche_titre($title?$title:$langs->trans("BackupDumpWizard"));
+?>
+
 <label for="zipfilename_template"> <?php echo $langs->trans("FileNameToGenerate"); ?></label><br>
 <input type="text" name="zipfilename_template" style="width: 90%"
 	id="zipfilename_template"
@@ -537,6 +543,7 @@ echo $file;
 ?>" /> <br>
 <br>
 
+
 <?php
 // Show compression choices
 print '<div class="formelementrow">';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c9fc85f32e8..196d6f50451 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018      Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -438,38 +439,40 @@ class Propal extends CommonObject
 		global $mysoc, $conf, $langs;
 
 		dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=".$fk_remise_except);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-		// Clean parameters
-		if (empty($remise_percent)) $remise_percent=0;
-		if (empty($qty)) $qty=0;
-		if (empty($info_bits)) $info_bits=0;
-		if (empty($rang)) $rang=0;
-		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-
-		$remise_percent=price2num($remise_percent);
-		$qty=price2num($qty);
-		$pu_ht=price2num($pu_ht);
-		$pu_ht_devise=price2num($pu_ht_devise);
-		$pu_ttc=price2num($pu_ttc);
-		$txtva=price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
-		$txlocaltax1=price2num($txlocaltax1);
-		$txlocaltax2=price2num($txlocaltax2);
-		$pa_ht=price2num($pa_ht);
-		if ($price_base_type=='HT')
-		{
-			$pu=$pu_ht;
-		}
-		else
-		{
-			$pu=$pu_ttc;
-		}
-
-		// Check parameters
-		if ($type < 0) return -1;
-
 		if ($this->statut == self::STATUS_DRAFT)
 		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+			// Clean parameters
+			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($qty)) $qty=0;
+			if (empty($info_bits)) $info_bits=0;
+			if (empty($rang)) $rang=0;
+			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu_ht=price2num($pu_ht);
+			$pu_ht_devise=price2num($pu_ht_devise);
+			$pu_ttc=price2num($pu_ttc);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
+			$txlocaltax1=price2num($txlocaltax1);
+			$txlocaltax2=price2num($txlocaltax2);
+			$pa_ht=price2num($pa_ht);
+			if ($price_base_type=='HT')
+			{
+				$pu=$pu_ht;
+			}
+			else
+			{
+				$pu=$pu_ttc;
+			}
+
+			// Check parameters
+			if ($type < 0) return -1;
+
 			$this->db->begin();
 
 			$product_type=$type;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3dc168f14c5..5b3f8006345 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -9,8 +9,8 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2016-2017 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI	<info@inovea-conseil.com>
+ * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1312,45 +1312,47 @@ class Commande extends CommonOrder
 		$logtext.= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise";
 		dol_syslog(get_class($this).$logtext, LOG_DEBUG);
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-		// Clean parameters
-		if (empty($remise_percent)) $remise_percent=0;
-		if (empty($qty)) $qty=0;
-		if (empty($info_bits)) $info_bits=0;
-		if (empty($rang)) $rang=0;
-		if (empty($txtva)) $txtva=0;
-		if (empty($txlocaltax1)) $txlocaltax1=0;
-		if (empty($txlocaltax2)) $txlocaltax2=0;
-		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-		if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
-
-		$remise_percent=price2num($remise_percent);
-		$qty=price2num($qty);
-		$pu_ht=price2num($pu_ht);
-		$pu_ht_devise=price2num($pu_ht_devise);
-		$pu_ttc=price2num($pu_ttc);
-		$pa_ht=price2num($pa_ht);
-		$txtva = price2num($txtva);
-		$txlocaltax1 = price2num($txlocaltax1);
-		$txlocaltax2 = price2num($txlocaltax2);
-		if ($price_base_type=='HT')
-		{
-			$pu=$pu_ht;
-		}
-		else
-		{
-			$pu=$pu_ttc;
-		}
-		$label=trim($label);
-		$desc=trim($desc);
-
-		// Check parameters
-		if ($type < 0) return -1;
-
 		if ($this->statut == self::STATUS_DRAFT)
 		{
-			$this->db->begin();
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+			// Clean parameters
+			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($qty)) $qty=0;
+			if (empty($info_bits)) $info_bits=0;
+			if (empty($rang)) $rang=0;
+			if (empty($txtva)) $txtva=0;
+			if (empty($txlocaltax1)) $txlocaltax1=0;
+			if (empty($txlocaltax2)) $txlocaltax2=0;
+			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+			if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
+
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu_ht=price2num($pu_ht);
+			$pu_ht_devise=price2num($pu_ht_devise);
+			$pu_ttc=price2num($pu_ttc);
+			$pa_ht=price2num($pa_ht);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
+			if ($price_base_type=='HT')
+			{
+				$pu=$pu_ht;
+			}
+			else
+			{
+				$pu=$pu_ttc;
+			}
+			$label=trim($label);
+			$desc=trim($desc);
+
+			// Check parameters
+			if ($type < 0) return -1;
+
+            $this->db->begin();
 
 			$product_type=$type;
 			if (!empty($fk_product))
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 94885ab118b..f20925d7c12 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -634,7 +634,7 @@ if ($resql)
 	    }
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
-		if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE == 1)
+		if (! empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE))
 		{
 			print '
 			    <script type="text/javascript">
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 227ae42b266..f980266226c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2663,55 +2663,47 @@ class Facture extends CommonInvoice
 		global $mysoc, $conf, $langs;
 
 		dol_syslog(get_class($this)."::addline id=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type, fk_unit=$fk_unit", LOG_DEBUG);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-		// Clean parameters
-		if (empty($remise_percent)) $remise_percent=0;
-		if (empty($qty)) $qty=0;
-		if (empty($info_bits)) $info_bits=0;
-		if (empty($rang)) $rang=0;
-		if (empty($ventil)) $ventil=0;
-		if (empty($txtva)) $txtva=0;
-		if (empty($txlocaltax1)) $txlocaltax1=0;
-		if (empty($txlocaltax2)) $txlocaltax2=0;
-		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-		if (empty($fk_prev_id)) $fk_prev_id = 'null';
-		if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
-
-		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
-
-		// Clean vat code
-		$vat_src_code='';
-		if (preg_match('/\((.*)\)/', $txtva, $reg))
-		{
-		    $vat_src_code = $reg[1];
-		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-		}
-
-		$remise_percent=price2num($remise_percent);
-		$qty=price2num($qty);
-		$pu_ht=price2num($pu_ht);
-        $pu_ht_devise=price2num($pu_ht_devise);
-		$pu_ttc=price2num($pu_ttc);
-		$pa_ht=price2num($pa_ht);
-		$txtva=price2num($txtva);
-		$txlocaltax1=price2num($txlocaltax1);
-		$txlocaltax2=price2num($txlocaltax2);
-
-		if ($price_base_type=='HT')
-		{
-			$pu=$pu_ht;
-		}
-		else
-		{
-			$pu=$pu_ttc;
-		}
-
-		// Check parameters
-		if ($type < 0) return -1;
-
 		if (! empty($this->brouillon))
 		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+			// Clean parameters
+			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($qty)) $qty=0;
+			if (empty($info_bits)) $info_bits=0;
+			if (empty($rang)) $rang=0;
+			if (empty($ventil)) $ventil=0;
+			if (empty($txtva)) $txtva=0;
+			if (empty($txlocaltax1)) $txlocaltax1=0;
+			if (empty($txlocaltax2)) $txlocaltax2=0;
+			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+			if (empty($fk_prev_id)) $fk_prev_id = 'null';
+			if (! isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu_ht=price2num($pu_ht);
+			$pu_ht_devise=price2num($pu_ht_devise);
+			$pu_ttc=price2num($pu_ttc);
+			$pa_ht=price2num($pa_ht);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			}
+			$txlocaltax1=price2num($txlocaltax1);
+			$txlocaltax2=price2num($txlocaltax2);
+
+			if ($price_base_type=='HT')
+			{
+				$pu=$pu_ht;
+			}
+			else
+			{
+				$pu=$pu_ttc;
+			}
+
+			// Check parameters
+			if ($type < 0) return -1;
+
 			$this->db->begin();
 
 			$product_type=$type;
@@ -2729,6 +2721,16 @@ class Facture extends CommonInvoice
 				}
 			}
 
+			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			}
+
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 16e343aaba8..c543e8a0720 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -8,9 +8,9 @@
  * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2017	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018   	Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2018	Ferran Marcet			<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1382,7 +1382,9 @@ class Contrat extends CommonObject
 			$pu_ht=price2num($pu_ht);
 			$pu_ttc=price2num($pu_ttc);
 			$pa_ht=price2num($pa_ht);
-			$txtva=price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1=price2num($txlocaltax1);
 			$txlocaltax2=price2num($txlocaltax2);
 			$remise_percent=price2num($remise_percent);
@@ -1407,21 +1409,21 @@ class Contrat extends CommonObject
 			// Check parameters
 			if (empty($remise_percent)) $remise_percent=0;
 
+			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			}
+
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
-
-		    // Clean vat code
-    		$vat_src_code='';
-    		if (preg_match('/\((.*)\)/', $txtva, $reg))
-    		{
-    		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-    		}
-
 			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 5056844bcee..1aade173dc3 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -179,7 +179,7 @@ if ($type == 'directory')
     $sorting = (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC);
 
     // Right area. If module is defined here, we are in automatic ecm.
-    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user', 'expensereport');
+    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user', 'expensereport', 'holiday');
 
     // TODO change for multicompany sharing
     // Auto area for suppliers invoices
@@ -210,6 +210,8 @@ if ($type == 'directory')
     else if ($module == 'user') $upload_dir = $conf->user->dir_output;
     // Auto area for expense report
     else if ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
+	// Auto area for holiday
+    else if ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
 
     // Automatic list
     if (in_array($module, $automodules))
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b13224782c9..8ba38b81edb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6861,10 +6861,10 @@ class Form
 			$dir=$conf->user->dir_output;
 			if (! empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
-				else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
-				else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
-				$originalfile=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
+				if ((string) $imagesize == 'mini') $file=get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
+				else if ((string) $imagesize == 'small') $file=get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
+				else $file=get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				$originalfile=get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
 			}
 			if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility
 			$email=$object->email;
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 857f8ee5c42..5a005e7de04 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -66,7 +66,7 @@ class FormBarCode
 
         $disable = '';
 
-        if ($conf->use_javascript_ajax)
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n".'<script type="text/javascript" language="javascript">';
             print 'jQuery(document).ready(function () {
@@ -86,19 +86,29 @@ class FormBarCode
         {
             $disable = 'disabled';
         }
-
-        $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
-        $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        $select_encoder.= '<input type="hidden" name="action" value="update">';
-        $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
+        
+        if (!empty($conf->use_javascript_ajax))
+        {
+            $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
+            $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $select_encoder.= '<input type="hidden" name="action" value="update">';
+            $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+        }
+        
+        $selectname=(!empty($conf->use_javascript_ajax)?'coder':'coder'.$code_id);
+        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
         $select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
         $select_encoder.= '<option value="-1" disabled>--------------------</option>';
         foreach($barcodelist as $key => $value)
         {
             $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
         }
-        $select_encoder.= '</select></form>';
+        $select_encoder.= '</select>';
+        
+        if (!empty($conf->use_javascript_ajax))
+        {
+            $select_encoder.= '</form>';
+        }
 
         return $select_encoder;
     }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 569d10dce4b..be9993a74b5 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1510,6 +1510,11 @@ class FormFile
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance=new ExpenseReport($this->db);
 		}
+		else if ($modulepart == 'holiday')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+			$object_instance=new Holiday($this->db);
+		}
 
 		foreach($filearray as $key => $file)
 		{
@@ -1539,7 +1544,8 @@ class FormFile
 				if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
 				if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
 				if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
 				if (! $id && ! $ref) continue;
 				$found=0;
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index afff8198e09..e3a0f44c9ac 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -377,7 +377,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 
 	// select2 disabled for smartphones with standard browser.
 	// TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array)
-	if ($conf->browser->layout == 'phone') return '';
+	if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return '';
 
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
 	if (empty($conf->use_javascript_ajax)) return '';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4522e23872f..9cc9f315e82 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4816,7 +4816,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	{
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "x.x (yy)"
 		{
 			$vatratecleaned = $reg[1];
 			$vatratecode = $reg[2];
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 2dc2acbcb6d..24dcf8743b0 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -370,7 +370,7 @@ class pdf_strato extends ModelePDFContract
 							$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txtpredefinedservice, dol_concatdesc($txt, $desc)), 0, 1, 0);
 							$pageposafter=$pdf->getPage();
 							$posyafter=$pdf->GetY();
-							
+
 							if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
 							{
 								if ($i == ($nblines-1))	// No more lines, and no space left to show total, so we create a new page
@@ -394,7 +394,7 @@ class pdf_strato extends ModelePDFContract
 
 						$nexY = $pdf->GetY() + 2;
 						$pageposafter=$pdf->getPage();
-						
+
 						$pdf->setPage($pageposbefore);
 						$pdf->setTopMargin($this->marge_haute);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
@@ -423,7 +423,7 @@ class pdf_strato extends ModelePDFContract
 							$pdf->setPage($pagenb);
 							$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
 						}
-						
+
 						if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 						{
 							if ($pagenb == 1)
@@ -447,7 +447,7 @@ class pdf_strato extends ModelePDFContract
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$this->_tab_signature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
+					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab=$this->page_hauteur - $heightforfooter - $heightforfooter + 1;
 				}
 				else
@@ -456,7 +456,7 @@ class pdf_strato extends ModelePDFContract
 					$this->tabSignature($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab=$this->page_hauteur - $heightforfooter - $heightforfooter + 1;
 				}
-				
+
 				$this->_pagefoot($pdf,$object,$outputlangs);
 				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 8ff31e54e3c..a3390475f44 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -331,6 +331,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (! empty($conf->projet->enabled))		{ $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
 	if (! empty($conf->ficheinter->enabled))	{ $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); }
 	if (! empty($conf->expensereport->enabled))	{ $langs->load("trips"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
+	if (! empty($conf->holiday->enabled))		{ $langs->load("holiday"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
 	$rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
 }
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 4bf0a80d8c9..dc2516822e7 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2011 Dimitri Mouillard   <dmouillard@teclib.com>
- * Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Alexandre Spangaro  <aspangaro@zendsi.com>
- * Copyright (C) 2016 Ferran Marcet       <fmarcet@2byte.es>
- * Copyright (C) 2018 Nicolas ZABOURI     <info@inovea-conseil.com>
+/* Copyright (C) 2011 		Dimitri Mouillard   	<dmouillard@teclib.com>
+ * Copyright (C) 2015 		Laurent Destailleur 	<eldy@users.sourceforge.net>
+ * Copyright (C) 2015 		Alexandre Spangaro  	<aspangaro@zendsi.com>
+ * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (c) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2018 	Ferran Marcet       	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1692,27 +1692,32 @@ class ExpenseReport extends CommonObject
 	 */
 	function addline($qty=0, $up=0, $fk_c_type_fees=0, $vatrate=0, $date='', $comments='', $fk_project=0, $fk_c_exp_tax_cat=0, $type=0)
 	{
-		global $conf,$langs;
+		global $conf,$langs,$mysoc;
 
         dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
 
-		if (empty($qty)) $qty = 0;
-		if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
-		if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) $fk_c_exp_tax_cat = 0;
-		if (empty($vatrate) || $vatrate < 0) $vatrate = 0;
-		if (empty($date)) $date = '';
-		if (empty($fk_project)) $fk_project = 0;
-
-		$qty = price2num($qty);
-		$vatrate = price2num($vatrate);
-		$up = price2num($up);
-
 		if ($this->fk_statut == self::STATUS_DRAFT)
-        {
+		{
+			if (empty($qty)) $qty = 0;
+			if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
+			if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) $fk_c_exp_tax_cat = 0;
+			if (empty($vatrate) || $vatrate < 0) $vatrate = 0;
+			if (empty($date)) $date = '';
+			if (empty($fk_project)) $fk_project = 0;
+
+			$qty = price2num($qty);
+			if (!preg_match('/\((.*)\)/', $vatrate)) {
+				$vatrate = price2num($vatrate);               // $txtva can have format '5.0(XXX)' or '5'
+			}
+			$up = price2num($up);
+
 			$this->db->begin();
 
 			$this->line = new ExpenseReportLine($this->db);
 
+			$localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc,$this->thirdparty);
+
+			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $vatrate, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -1721,7 +1726,8 @@ class ExpenseReport extends CommonObject
 			$vatrate = preg_replace('/\*/','',$vatrate);
 
 			$seller = '';  // seller is unknown
-			$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
+
+			$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller, $localtaxes_type);
 
 			$this->line->value_unit = $up;
 			$this->line->vatrate = price2num($vatrate);
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 484229a1de2..70fdcfba305 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','9.0.0-beta');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','10.0.0-alpha');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO',chr(128));
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 77ad3d20048..9f17e9afdf2 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1289,9 +1290,9 @@ class CommandeFournisseur extends CommonOrder
 	            // insert products details into database
 	            for ($i=0;$i<$num;$i++)
 	            {
-	                
+
 	                $this->special_code = $this->lines[$i]->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
-	                
+
 	                $result = $this->addline(              // This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
 	                    $this->lines[$i]->desc,
 	                    $this->lines[$i]->subprice,
@@ -1504,42 +1505,47 @@ class CommandeFournisseur extends CommonOrder
         dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        // Clean parameters
-        if (! $qty) $qty=1;
-        if (! $info_bits) $info_bits=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-		if (empty($remise_percent)) $remise_percent=0;
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ht_devise=price2num($pu_ht_devise);
-        $pu_ttc=price2num($pu_ttc);
-        $txtva = price2num($txtva);
-        $txlocaltax1 = price2num($txlocaltax1);
-        $txlocaltax2 = price2num($txlocaltax2);
-        if ($price_base_type=='HT')
-        {
-            $pu=$pu_ht;
-        }
-        else
-        {
-            $pu=$pu_ttc;
-        }
-        $desc=trim($desc);
+			// Clean parameters
+			if (! $qty) $qty=1;
+			if (! $info_bits) $info_bits=0;
+			if (empty($txtva)) $txtva=0;
+			if (empty($txlocaltax1)) $txlocaltax1=0;
+			if (empty($txlocaltax2)) $txlocaltax2=0;
+			if (empty($remise_percent)) $remise_percent=0;
+
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu_ht=price2num($pu_ht);
+			$pu_ht_devise=price2num($pu_ht_devise);
+			$pu_ttc=price2num($pu_ttc);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+			}
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
+			if ($price_base_type=='HT')
+			{
+				$pu=$pu_ht;
+			}
+			else
+			{
+				$pu=$pu_ttc;
+			}
+			$desc=trim($desc);
+
+			// Check parameters
+			if ($qty < 1 && ! $fk_product)
+			{
+				$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Product"));
+				return -1;
+			}
+			if ($type < 0) return -1;
 
-        // Check parameters
-        if ($qty < 1 && ! $fk_product)
-        {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Product"));
-            return -1;
-        }
-        if ($type < 0) return -1;
 
-        if ($this->statut == self::STATUS_DRAFT)
-        {
             $this->db->begin();
 
             if ($fk_product > 0)
@@ -1605,10 +1611,9 @@ class CommandeFournisseur extends CommonOrder
                 $product_type = $type;
             }
 
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et txtva
-            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+            	$pu = 0;
+            }
 
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
 
@@ -1620,9 +1625,10 @@ class CommandeFournisseur extends CommonOrder
                 $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
             }
 
-            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-                $pu = 0;
-            }
+            // Calcul du total TTC et de la TVA pour la ligne a partir de
+            // qty, pu, remise_percent et txtva
+            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx,$pu_ht_devise);
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 080f22f6a61..a4b89edff42 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1564,201 +1564,214 @@ class FactureFournisseur extends CommonInvoice
     	dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($ventil)) $ventil=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			// Clean parameters
+			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($qty)) $qty=0;
+			if (empty($info_bits)) $info_bits=0;
+			if (empty($rang)) $rang=0;
+			if (empty($ventil)) $ventil=0;
+			if (empty($txtva)) $txtva=0;
+			if (empty($txlocaltax1)) $txlocaltax1=0;
+			if (empty($txlocaltax2)) $txlocaltax2=0;
 
-        $this->db->begin();
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			$pu=price2num($pu);
+			$txlocaltax1=price2num($txlocaltax1);
+			$txlocaltax2=price2num($txlocaltax2);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
 
-        if ($fk_product > 0)
-        {
-        	if (! empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
-        	{
-        		// Check quantity is enough
-        		dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
-        		$prod = new Product($this->db, $fk_product);
-        		if ($prod->fetch($fk_product) > 0)
-        		{
-        			$product_type = $prod->type;
-        			$label = $prod->label;
-        			$fk_prod_fourn_price = 0;
+	        $this->db->begin();
 
-        			// We use 'none' instead of $ref_supplier, because $ref_supplier may not exists anymore. So we will take the first supplier price ok.
-        			// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-        			$result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid));   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
-        			if ($result > 0)
-        			{
-        				$pu = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
-        				$ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
-        				// is remise percent not keyed but present for the product we add it
-        				if ($remise_percent == 0 && $prod->remise_percent !=0)
-        					$remise_percent =$prod->remise_percent;
-        			}
-        			if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-        			{
-        				$langs->load("errors");
-        				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
-        				$this->db->rollback();
-        				dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
-        				//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
-        				//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
-        				return -1;
-        			}
-        			if ($result == -1)
-        			{
-        				$langs->load("errors");
-        				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
-        				$this->db->rollback();
-        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
-        				return -1;
-        			}
-        			if ($result < -1)
-        			{
-        				$this->error=$prod->error;
-        				$this->db->rollback();
-        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
-        				return -1;
-        			}
-        		}
-        		else
-        		{
-        			$this->error=$prod->error;
-        			$this->db->rollback();
-        			return -1;
-        		}
-        	}
+	        if ($fk_product > 0)
+	        {
+	        	if (! empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
+	        	{
+	        		// Check quantity is enough
+	        		dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
+	        		$prod = new Product($this->db, $fk_product);
+	        		if ($prod->fetch($fk_product) > 0)
+	        		{
+	        			$product_type = $prod->type;
+	        			$label = $prod->label;
+	        			$fk_prod_fourn_price = 0;
+
+	        			// We use 'none' instead of $ref_supplier, because $ref_supplier may not exists anymore. So we will take the first supplier price ok.
+	        			// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+	        			$result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid));   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+	        			if ($result > 0)
+	        			{
+	        				$pu = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
+	        				$ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+	        				// is remise percent not keyed but present for the product we add it
+	        				if ($remise_percent == 0 && $prod->remise_percent !=0)
+	        					$remise_percent =$prod->remise_percent;
+	        			}
+	        			if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+	        			{
+	        				$langs->load("errors");
+	        				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+	        				$this->db->rollback();
+	        				dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+	        				//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+	        				//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+	        				return -1;
+	        			}
+	        			if ($result == -1)
+	        			{
+	        				$langs->load("errors");
+	        				$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+	        				$this->db->rollback();
+	        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+	        				return -1;
+	        			}
+	        			if ($result < -1)
+	        			{
+	        				$this->error=$prod->error;
+	        				$this->db->rollback();
+	        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+	        				return -1;
+	        			}
+	        		}
+	        		else
+	        		{
+	        			$this->error=$prod->error;
+	        			$this->db->rollback();
+	        			return -1;
+	        		}
+	        	}
+	        }
+	        else
+	        {
+	        	$product_type = $type;
+	        }
+
+	        if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+	        	$pu = 0;
+	        }
+
+	        $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
+
+	        // Clean vat code
+	        $vat_src_code='';
+	        if (preg_match('/\((.*)\)/', $txtva, $reg))
+	        {
+	        	$vat_src_code = $reg[1];
+	        	$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+	        }
+
+	        // Calcul du total TTC et de la TVA pour la ligne a partir de
+	        // qty, pu, remise_percent et txtva
+	        // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+	        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+	        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+	        $total_ht  = $tabprice[0];
+	        $total_tva = $tabprice[1];
+	        $total_ttc = $tabprice[2];
+	        $total_localtax1 = $tabprice[9];
+	        $total_localtax2 = $tabprice[10];
+			$pu_ht = $tabprice[3];
+
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
+
+			// Check parameters
+			if ($type < 0) return -1;
+
+			if ($rang < 0)
+			{
+				$rangmax = $this->line_max();
+				$rang = $rangmax + 1;
+			}
+
+			// Insert line
+			$this->line=new SupplierInvoiceLine($this->db);
+
+			$this->line->context = $this->context;
+
+			$this->line->fk_facture_fourn=$this->id;
+			//$this->line->label=$label;	// deprecated
+			$this->line->desc=$desc;
+			$this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
+			$this->line->ref_supplier=$ref_supplier;
+
+			$this->line->vat_src_code=$vat_src_code;
+			$this->line->tva_tx=$txtva;
+			$this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
+			$this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->fk_product=$fk_product;
+			$this->line->product_type=$type;
+			$this->line->remise_percent=$remise_percent;
+			$this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
+			$this->line->date_start=$date_start;
+			$this->line->date_end=$date_end;
+			$this->line->ventil=$ventil;
+			$this->line->rang=$rang;
+			$this->line->info_bits=$info_bits;
+			$this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
+			$this->line->total_tva=      $total_tva;
+			$this->line->total_localtax1=$total_localtax1;
+			$this->line->total_localtax2=$total_localtax2;
+			$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
+			$this->line->special_code=$this->special_code;
+			$this->line->fk_parent_line=$this->fk_parent_line;
+			$this->line->origin=$this->origin;
+			$this->line->origin_id=$origin_id;
+			$this->line->fk_unit=$fk_unit;
+
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			if (is_array($array_options) && count($array_options)>0) {
+				$this->line->array_options=$array_options;
+			}
+
+			$result=$this->line->insert($notrigger);
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+				// Mise a jour informations denormalisees au niveau de la facture meme
+				$result=$this->update_price(1,'auto',0,$this->thirdparty);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return $this->line->id;
+				}
+				else
+				{
+					$this->error=$this->db->error();
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->error=$this->line->error;
+				$this->errors=$this->line->errors;
+				$this->db->rollback();
+				return -2;
+			}
         }
         else
         {
-        	$product_type = $type;
-        }
-
-
-        $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
-
-        // Clean vat code
-        $vat_src_code='';
-        if (preg_match('/\((.*)\)/', $txtva, $reg))
-        {
-            $vat_src_code = $reg[1];
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-        }
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu=price2num($pu);
-        $txtva=price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-
-        if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-            $pu = 0;
-        }
-
-        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-        $total_ht  = $tabprice[0];
-        $total_tva = $tabprice[1];
-        $total_ttc = $tabprice[2];
-        $total_localtax1 = $tabprice[9];
-        $total_localtax2 = $tabprice[10];
-		$pu_ht = $tabprice[3];
-
-        // MultiCurrency
-        $multicurrency_total_ht  = $tabprice[16];
-        $multicurrency_total_tva = $tabprice[17];
-        $multicurrency_total_ttc = $tabprice[18];
-		$pu_ht_devise = $tabprice[19];
-
-        // Check parameters
-        if ($type < 0) return -1;
-
-        if ($rang < 0)
-        {
-        	$rangmax = $this->line_max();
-        	$rang = $rangmax + 1;
-        }
-
-        // Insert line
-        $this->line=new SupplierInvoiceLine($this->db);
-
-        $this->line->context = $this->context;
-
-        $this->line->fk_facture_fourn=$this->id;
-        //$this->line->label=$label;	// deprecated
-        $this->line->desc=$desc;
-        $this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
-		$this->line->ref_supplier=$ref_supplier;
-
-        $this->line->vat_src_code=$vat_src_code;
-        $this->line->tva_tx=$txtva;
-        $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
-        $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
-        $this->line->localtax1_type = $localtaxes_type[0];
-        $this->line->localtax2_type = $localtaxes_type[2];
-        $this->line->fk_product=$fk_product;
-        $this->line->product_type=$type;
-        $this->line->remise_percent=$remise_percent;
-        $this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
-        $this->line->date_start=$date_start;
-        $this->line->date_end=$date_end;
-        $this->line->ventil=$ventil;
-        $this->line->rang=$rang;
-        $this->line->info_bits=$info_bits;
-        $this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
-        $this->line->total_tva=      $total_tva;
-        $this->line->total_localtax1=$total_localtax1;
-        $this->line->total_localtax2=$total_localtax2;
-        $this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
-        $this->line->special_code=$this->special_code;
-        $this->line->fk_parent_line=$this->fk_parent_line;
-        $this->line->origin=$this->origin;
-        $this->line->origin_id=$origin_id;
-        $this->line->fk_unit=$fk_unit;
-
-        // Multicurrency
-        $this->line->fk_multicurrency			= $this->fk_multicurrency;
-        $this->line->multicurrency_code			= $this->multicurrency_code;
-        $this->line->multicurrency_subprice		= $pu_ht_devise;
-        $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-        $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-        $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-        if (is_array($array_options) && count($array_options)>0) {
-            $this->line->array_options=$array_options;
-        }
-
-        $result=$this->line->insert($notrigger);
-        if ($result > 0)
-        {
-            // Reorder if child line
-            if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-            // Mise a jour informations denormalisees au niveau de la facture meme
-            $result=$this->update_price(1,'auto',0,$this->thirdparty);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
-            if ($result > 0)
-            {
-                $this->db->commit();
-                return $this->line->id;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->line->error;
-            $this->errors=$this->line->errors;
-            $this->db->rollback();
-            return -2;
+        	return 0;
         }
     }
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index ceaf1f5be90..b53b25f93b1 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -317,6 +317,7 @@ ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount double
 
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
+ALTER TABLE llx_paiementfourn ADD COLUMN fk_user_modif integer AFTER fk_user_author;
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 97770d39e9d..b39f67dd3ba 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -57,6 +57,7 @@ $langs->loadLangs(array("admin", "install"));
 $login = GETPOST('login', 'alpha')?GETPOST('login', 'alpha'):(empty($argv[5])?'':$argv[5]);
 $pass = GETPOST('pass', 'alpha')?GETPOST('pass', 'alpha'):(empty($argv[6])?'':$argv[6]);
 $pass_verif = GETPOST('pass_verif', 'alpha')?GETPOST('pass_verif', 'alpha'):(empty($argv[7])?'':$argv[7]);
+$force_install_lockinstall = (int) (! empty($force_install_lockinstall)?$force_install_lockinstall:(GETPOST('installlock','aZ09')?GETPOST('installlock','aZ09'):(empty($argv[8])?'':$argv[8])));
 
 $success=0;
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 1011dcef9cb..6ea7940d7a0 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -446,7 +446,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','9.0.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-        	//migrate_rename_directories($db,$langs,$conf,'/contracts','/contract');
+        	migrate_user_photospath();
         }
     }
 
@@ -4826,7 +4826,80 @@ function migrate_reload_menu($db,$langs,$conf,$versionto)
     }
 }
 
+/**
+ * Migrate file from old path to new one for users
+ *
+ * @return	void
+ */
+function migrate_user_photospath()
+{
+	global $conf, $db, $langs;
 
+	print '<tr><td colspan="4">';
+
+	print '<b>'.$langs->trans('MigrationUserPhotoPath')."</b><br>\n";
+
+	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	$fuser = new User($db);
+
+	$sql = "SELECT rowid as uid from ".MAIN_DB_PREFIX."user";	// Get list of all users
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($obj = $db->fetch_object($resql))
+		{
+			$fuser->fetch($obj->uid);
+			//echo '<hr>'.$fuser->id.' -> '.$fuser->entity;
+			$entity = (!empty($fuser->entity)) ? $fuser->entity : 1;
+			if ($entity > 1) {
+				$dir = DOL_DATA_ROOT . '/' . $entity . '/users';
+			} else {
+				$dir = $conf->user->multidir_output[$entity];	// $conf->user->multidir_output[] for each entity is construct by the multicompany module
+			}
+			$origin = $dir .'/'. get_exdir($fuser->id,2,0,0,$fuser,'user');
+			$destin = $dir.'/'.$fuser->id;
+
+			$error = 0;
+
+			$origin_osencoded=dol_osencode($origin);
+			$destin_osencoded=dol_osencode($destin);
+			dol_mkdir($destin);
+			//echo '<hr>'.$origin.' -> '.$destin;
+			if (dol_is_dir($origin))
+			{
+				$handle=opendir($origin_osencoded);
+		        if (is_resource($handle))
+		        {
+		        	while (($file = readdir($handle)) !== false)
+		    		{
+		     			if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
+		    			{
+		    				$thumbs = opendir($origin_osencoded.'/'.$file);
+		    				if (is_resource($thumbs))
+		        			{
+			     				dol_mkdir($destin.'/'.$file);
+			     				while (($thumb = readdir($thumbs)) !== false)
+				    			{
+				    				dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
+				    			}
+		//		    			dol_delete_dir($origin.'/'.$file);
+		        			}
+		    			}
+		    			else
+		    			{
+		    				if (dol_is_file($origin.'/'.$file) )
+		    				{
+		    					dol_move($origin.'/'.$file, $destin.'/'.$file);
+		    				}
+		    			}
+		    		}
+		        }
+			}
+		}
+	}
+
+	print '</td></tr>';
+}
 
 
 /* A faire egalement: Modif statut paye et fk_facture des factures payes completement
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 98562eee861..69fcc0fe0a2 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=أدوات وحدات متعددة
 ModuleFamilyExperimental=نماذج تجريبية
 ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
 ModuleFamilyECM=إدارة المحتوى في المؤسسة
-ModuleFamilyPortal=المواقع على شبكة الإنترنت وتطبيق مباشر الآخرين
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=واجهات مع الأنظمة الخارجية
 MenuHandlers=قائمة مناولي
 MenuAdmin=قائمة تحرير
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=مجموعات المستخدمين
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=شركات الاتصالات وإدارة
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=التجارية
 Module2Desc=الإدارة التجارية
 Module10Name=المحاسبة
@@ -501,7 +501,7 @@ Module23Desc=مراقبة استهلاك الطاقة
 Module25Name=طلبات الزبائن
 Module25Desc=طلبات الزبائن إدارة
 Module30Name=فواتير
-Module30Desc=ويلاحظ اعتماد الفواتير وإدارة العملاء. فواتير إدارة الموردين
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=الموردين
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=أسعار الضريبة على القيمة المضافة أو
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=شروط الدفع
 DictionaryPaymentModes=وسائل الدفع
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=ضرائب بيئية (WEEE)
 DictionaryPaperFormat=تنسيقات ورقة
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=تقارير الضرائب المحلية هي مجموعه l
 LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون
 LabelOnDocuments=علامة على وثائق
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=في نهاية الشهر
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=مراجعة الحسابات الأحداث الأمنية
-Audit=المراجعة
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
 SecurityEventsPurged=تطهير الاحداث الامنية
-LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr الأحداث الأمنية. يمكن للمشرفين ثم انظر مضمونه عبر <b>نظام</b> القائمة <b>أدوات -- لمراجعة الحسابات.</b> محذرا من أن هذه الميزة يمكن أن تستهلك كمية كبيرة من البيانات في قاعدة البيانات.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=خطوة للتقريب النطاق (للبلدان ال
 UnitPriceOfProduct=صافي سعر وحدة من المنتج
 TotalPriceAfterRounding=إجمالي السعر الصافي / ضريبة القيمة المضافة / ضريبة مدفوع) بعد التقريب
 ParameterActiveForNextInputOnly=معلمة فعالة للمساهمة المقبل فقط
-NoEventOrNoAuditSetup=لا أمن الحدث وقد سجلت حتى الآن. هذا طبيعي ويمكن مراجعة الحسابات اذا لم يتم تمكين "الإعداد -- الأمن -- مراجعة" الصفحة.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=انظر الى إرسال البريد الإعداد المحلي
 BackupDesc=لتقديم دعم كامل للDolibarr ، يجب عليك :
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=سمات التكميلية (خطوط النظام)
 ExtraFieldsSupplierInvoicesLines=سمات التكميلية (خطوط الفاتورة)
 ExtraFieldsThirdParties=سمات التكميلية (مرشحين عن)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=سمات التكميلية (عضو)
 ExtraFieldsMemberType=سمات التكميلية (النوع الأعضاء)
 ExtraFieldsCustomerInvoices=سمات التكميلية (الفواتير)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=قائمة الإشعارات ثابت
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=عتبة
 BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ الاحتياطي ملف تفريغ
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=الرمز البريدي
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index f4941b1e2f9..0bf6251340d 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -7,7 +7,7 @@ BankName=اسم المصرف
 FinancialAccount=الحساب
 BankAccount=الحساب المصرفي
 BankAccounts=الحسابات المصرفية
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=عرض الحساب
 AccountRef=مرجع الحساب المالي
 AccountLabel=بطاقة الحساب المالي
@@ -46,7 +46,7 @@ BankAccountDomiciliation=عنوان الحساب
 BankAccountCountry=بلد حساب
 BankAccountOwner=اسم صاحب الحساب
 BankAccountOwnerAddress=عنوان مالك الحساب
-RIBControlError=فشل التحقق من سلامة القيم. وهذا يعني أن المعلومات الخاصة برقم الحساب هذا غير كاملة أو خاطئة (راجع البلد والأرقام و إيبان).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
@@ -76,6 +76,7 @@ TransactionsToConciliate=قيود للتسويات
 Conciliable=يمكن أن يتم تسويتة
 Conciliate=التسوية
 Conciliation=تسوية
+SaveStatementOnly=Save statement only
 ReconciliationLate=التسوية في وقت متأخر
 IncludeClosedAccount=وتشمل حسابات مغلقة
 OnlyOpenedAccount=الحسابات المفتوحة فقط
@@ -104,7 +105,7 @@ SocialContributionPayment=مدفوعات الضرائب الاجتماعية / 
 BankTransfer=حوالة مصرفية
 BankTransfers=حوالات المصرفية
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=التحويل من حساب إلى آخر، سوف يقوم دوليبار بكتابة سجلين (مدين في حساب المصدر و دائن في حساب الهدف، نفس المبلغ (باستثناء العلامة)، سيتم استخدام البطاقة و التاريخ لهذه المعاملة)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا 
 BankChecks=الشيكات المصرفية
 BankChecksToReceipt=شيكات في انتظار الإيداع
 ShowCheckReceipt=عرض إيصال إيداع شيكات
-NumberOfCheques=عدد الشيكات
+NumberOfCheques=No. of check
 DeleteTransaction=حذف المعاملة
 ConfirmDeleteTransaction=هل تريد بالتأكيد حذف هذه المعاملة؟
 ThisWillAlsoDeleteBankRecord=سيؤدي هذا أيضا إلى حذف القيد البنكي الذي تم إنشاؤه
@@ -135,8 +136,8 @@ BankTransactionLine=قيد البنك
 AllAccounts=All bank and cash accounts
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
-FutureTransaction=المعاملة أجلة. لا يوجد فرصة للتسوية.
-SelectChequeTransactionAndGenerate=تحديد / تصفية الشيكات ليتم تضمينها في ايصال ايداع الشيكات وانقر على  "إنشاء".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
 ToConciliate=للتسوية؟
@@ -153,7 +154,7 @@ RejectCheckDate=تاريخ إرجاع الشيك
 CheckRejected=تم إرجاع الشيك
 CheckRejectedAndInvoicesReopened=تم ارجاع الشيك وإعادة فتح الفواتير
 BankAccountModelModule=نماذج مستندات للحسابات البنكية
-DocumentModelSepaMandate=نموذج تفويض سيبا. مفيدة للبلدان الأوروبية في السوق الأوروبية المشتركة فقط.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=نموذج لطباعة صفحة تحتوي على معلومات BAN .
 NewVariousPayment=مدفوعات متنوعة جديدة
 VariousPayment=مدفوعات متنوعة
@@ -162,4 +163,6 @@ ShowVariousPayment=عرض الدفعات المتنوعة
 AddVariousPayment=إضافة دفعات متنوعة
 SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
-FindYourSEPAMandate=هذا هو تفويض سيبا الخاصة بك لتخويل شركتنا لتقديم أمر الخصم المباشر إلى البنك الذي تتعامل معه. شكرا للعودة وقعت (فحص الوثيقة الموقعة) أو إرسالها عن طريق البريد إلى
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index ad6cde19245..194e9f2fb71 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=الفاتورة الأولية
 InvoiceProFormaDesc=<b> الفاتورة المبدئية </b> عبارة عن صورة فاتورة حقيقية ولكنها لا تحتوي على قيمة للمحاسبة.
 InvoiceReplacement=استبدال الفاتورة
 InvoiceReplacementAsk=فاتورة استبدال الفاتورة
-InvoiceReplacementDesc=<b> الفاتورة البديلة</b> يتم استخدامها لإلغاء واستبدال بالكامل الفاتورة التي لا تتضمن أية دفعات عليها. <br> <br> ملاحظة: لا يمكن استبدال سوى الفواتير التي لا تتضمن أية دفعات عليها. إذا لم يتم إغلاق الفاتورة التي استبدلتها بعد، فسيتم إغلاقها تلقائيا إلى "مهمل".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=ملاحظة ائتمانية
 InvoiceAvoirAsk=ملاحظة ائتمانية لتصحيح الفاتورة
-InvoiceAvoirDesc=<b> الملاحظة الائتمانية</b> عبارة عن فاتورة سلبية تستخدم لحل حقيقة أن الفاتورة تحتوي على مبلغ يختلف عن المبلغ المدفوع فعلا (لأن العميل دفع مبالغ كبيرة عن طريق الخطأ، أو لن يدفعوا بشكل كامل حيث أنه اعاد بعض المنتجات على سبيل المثال).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=إنشاء الائتمان ملاحظة مع خطوط من الفاتورة الأصلية
 invoiceAvoirWithPaymentRestAmount=إنشاء الائتمان ملاحظة مع المتبقية غير المسددة من الفاتورة الأصلية
 invoiceAvoirLineWithPaymentRestAmount=ملاحظة الائتمان للبقاء المبلغ غير المدفوع
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
 DeletePayment=حذف الدفعة
 ConfirmDeletePayment=هل انت متأكد انك ترغب في حذف هذه الدفعة؟
-ConfirmConvertToReduc=هل تريد تحويل هذا %s إلى خصم مطلق؟<br> سيتم حفظ المبلغ حتى بين جميع الخصومات، ويمكن استخدامها كخصم لفاتورة الحالية أو المستقبلية لهذا العميل.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=مدفوعات الموردين
 ReceivedPayments=المدفوعات المستلمة
 ReceivedCustomersPayments=المدفوعات المستلمة من العملاء
-PayedSuppliersPayments=المدفوعات التي دفعت للموردين
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=تلقى مدفوعات عملاء للمصادقة
 PaymentsReportsForYear=تقارير المدفوعات لل%s
 PaymentsReports=تقارير المدفوعات
@@ -91,8 +91,8 @@ PaymentConditionsShort=شروط الدفع
 PaymentAmount=دفع مبلغ
 ValidatePayment=تحقق من الدفع
 PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
-HelpPaymentHigherThanReminderToPay=الاهتمام ، على دفع مبلغ واحد أو أكثر من فواتير أعلى من الراحة على الدفع. <br> تعديل الدخول ، تؤكد خلاف ذلك والتفكير في إنشاء الائتمان علما الزائدة وتلقى كل الفواتير الزائدة.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=تصنيف 'مدفوع'
 ClassifyPaidPartially=تصنيف 'مدفوع جزئيا'
 ClassifyCanceled=تصنيف 'المهجورة'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=مغلقة (غير مدفوعة الأجر)
 BillStatusClosedPaidPartially=دفعت (جزئيا)
 BillShortStatusDraft=مسودة
 BillShortStatusPaid=دفع
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=دفع
 BillShortStatusCanceled=المهجورة
 BillShortStatusValidated=صادق
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=مغلقة
 BillShortStatusClosedPaidPartially=دفعت (جزئيا)
 PaymentStatusToValidShort=للمصادقة
-ErrorVATIntraNotConfigured=Intracommunautary رقم الضريبة على القيمة المضافة لم تحدد بعد
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=لا يعرف طريقة الدفع الافتراضية. الذهاب الى الفاتورة وحدة لتحديد هذا الإعداد.
 ErrorCreateBankAccount=إنشاء حساب مصرفي ، ثم يذهب إلى إعداد فريق من الفاتورة وحدة لتحديد طرق الدفع
 ErrorBillNotFound=فاتورة %s لا يوجد
-ErrorInvoiceAlreadyReplaced=خطأ ، في محاولة لإثبات صحة فاتورة لتحل محل الفاتورة ٪ s. ولكن هذا قد تم الاستعاضة عن فاتورة ٪ s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=خطأ الخصم المستخدمة بالفعل
 ErrorInvoiceAvoirMustBeNegative=خطأ ، والصحيح يجب أن يكون للفاتورة بمبلغ سلبي
 ErrorInvoiceOfThisTypeMustBePositive=خطأ ، وهذا النوع من فاتورة يجب أن يكون إيجابيا المبلغ
 ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغاء الفاتورة التي حلت محلها اخرى الفاتورة التي لا تزال في حالة مشروع
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. I تسوية الضريبة على القيمة المضافة مع ملاحظة الائتمان.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. أنا أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. I استرداد ضريبة القيمة المضافة على هذا الخصم دون مذكرة الائتمان.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة
 ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=هذا الخيار ممكن إذا الفاتورة تم تزويد مناسبة. (مثال «فقط الضرائب المقابلة إلى أن الأسعار قد دفعت فعلا تعطي الحقوق لخصم»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=في بعض البلدان ، وهذا الخيار قد يكون ممكنا إلا إذا الفاتورة صحيحة وتتضمن المذكرة.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=استخدام هذا الخيار إذا كان كل ما لا يتناسب مع
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=وهناك <b>سوء العميل</b> عميل التي ترفض سداد ديونه.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ويستخدم هذا الاختيار عند الدفع ليس كاملا لأن بعض المنتجات أعيدت
-ConfirmClassifyPaidPartiallyReasonOtherDesc=استخدام هذا الخيار إذا كان كل ما لا يتناسب مع غيرها ، على سبيل المثال في الحالة التالية : <br> -- دفع ليست كاملة لأن بعض المنتجات شحنت العودة <br> -- أهم من المبلغ المطالب به لأن الخصم هو نسيان <br> في جميع الحالات ، والمبالغة في المبلغ المطالب به لا بد من تصحيحه في نظام المحاسبة عن طريق إنشاء الائتمان المذكرة.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=أخرى
 ConfirmClassifyAbandonReasonOtherDesc=هذا الخيار وسوف يستخدم في جميع الحالات الأخرى. على سبيل المثال لأنك من خطة لإقامة استبدال الفاتورة.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=التحقق من صحة الفواتير
 UnvalidateBill=Unvalidate فاتورة
-NumberOfBills=ملاحظة : من الفواتير
-NumberOfBillsByMonth=ملحوظة من الفواتير من قبل شهر
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=مبلغ الفواتير
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
 ShowSocialContribution=تظهر الضريبة الاجتماعية / المالية
 ShowBill=وتظهر الفاتورة
@@ -260,9 +262,9 @@ Repeatables=النماذج
 ChangeIntoRepeatableInvoice=تحويل إلى قالب فاتورة
 CreateRepeatableInvoice=إنشاء فاتورة قالب
 CreateFromRepeatableInvoice=إنشاء من قالب الفاتورة
-CustomersInvoicesAndInvoiceLines=فواتير العملاء والفواتير 'خطوط
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات
-ExportDataset_invoice_1=قائمة العملاء والفواتير والفواتير 'خطوط
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=العملاء والفواتير والمدفوعات
 ProformaBill=Proforma بيل :
 Reduction=تخفيض
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=مشروع قانون معالجة
-HelpEscompte=هذا الخصم هو الخصم الممنوح للعميل لأن الدفع قبل البعيد.
-HelpAbandonBadCustomer=هذا المبلغ قد تم التخلي عنها (وذكر أن العملاء سيئة العملاء) ، ويعتبر أحد exceptionnal فضفاضة.
-HelpAbandonOther=هذا المبلغ قد تم التخلي عنها لأنها كانت خطأ (خطأ أو فاتورة العميل أي بعبارة أخرى على سبيل المثال)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=اجتماعي / ضريبة مالية دفع معرف
 PaymentId=دفع معرف
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=لا فاتورة مختارة
 CloneInvoice=استنساخ الفاتورة
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=العمل والمعوقين بسبب الفاتورة قد استبدل
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=ملاحظة : للمدفوعات
+DescTaxAndDividendsArea=تقدم هذا المجال ملخص لجميع المبالغ المدفوعة للنفقات الخاصة. يتم تضمين السجلات فقط مع دفع خلال السنة الثابتة هنا.
+NbOfPayments=No. of payments
 SplitDiscount=انقسام في الخصم
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=مقدار مساهمة كل من جزأين :
-TotalOfTwoDiscountMustEqualsOriginal=مجموعه جديدتين الخصم يجب أن تكون مساوية للخصم المبلغ الأصلي.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=الفاتورة ذات الصلة
 RelatedBills=الفواتير ذات الصلة
 RelatedCustomerInvoices=فواتير العملاء ذات صلة
 RelatedSupplierInvoices=فواتير الموردين ذات صلة
 LatestRelatedBill=أحدث فاتورة ذات الصلة
-WarningBillExist=تحذير، واحد أو أكثر من فاتورة موجودة بالفعل
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=دمج أداة PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=الشيكات
 PaymentTypeShortCHQ=الشيكات
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=على خط التسديد
-PaymentTypeShortVAD=على خط التسديد
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=مسودة
 PaymentTypeFAC=عامل
 PaymentTypeShortFAC=عامل
 BankDetails=التفاصيل المصرفية
 BankCode=رمز المصرف
-DeskCode=مدونة مكتبية
+DeskCode=Office code
 BankAccountNumber=رقم الحساب
-BankAccountNumberKey=مفتاح
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=عدد إيبان
+IBANNumber=IBAN complete account number
 IBAN=إيبان
 BIC=بيك / سويفت
 BICNumber=بيك / سويفت عدد
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=الدفع عن طريق التحويل عل
 VATIsNotUsedForInvoice=* عدم الفنية للتطبيق ضريبة القيمة المضافة 293B من المجموعة الاستشارية لاندونيسيا
 LawApplicationPart1=من خلال تطبيق القانون 80.335 من 12/05/80
 LawApplicationPart2=البضاعة تظل ملكا لل
-LawApplicationPart3=البائع إلى حين استكمال صرف
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=ثمنها.
 LimitedLiabilityCompanyCapital=SARL برأس مال
 UseLine=تطبيق
@@ -463,7 +465,7 @@ Cheques=الشيكات
 DepositId=إيداع معرف
 NbCheque=عدد الشيكات
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=فواتير العملاء استخدام عنوان الاتصال بدلا من التصدي لطرف ثالث كما المتلقية للفواتير
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
 ShowUnpaidLateOnly=وتبين في وقت متأخر من الفواتير غير المدفوعة فقط
 PaymentInvoiceRef=دفع فاتورة %s
@@ -474,21 +476,22 @@ Reported=تأخر
 DisabledBecausePayments=غير ممكن لأن هناك بعض المدفوعات
 CantRemovePaymentWithOneInvoicePaid=تصنيف لا يمكن إزالة الدفع لأنه ليس هناك على الأقل على الفاتورة سيولي
 ExpectedToPay=من المتوقع الدفع
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=سيولي هذا الدفع
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=تصنيف "مدفوع" كل الملاحظات الائتمان تدفع بالكامل مرة أخرى.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى &quot;فياض&quot; الوضع.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=دفع
 ToMakePaymentBack=تسديد
 ListOfYourUnpaidInvoices=قائمة الفواتير غير المسددة
 NoteListOfYourUnpaidInvoices=ملاحظة: تحتوي هذه القائمة على الفواتير الوحيدة لأطراف ثالثة ترتبط لك كممثل بيع.
 RevenueStamp=طوابع الواردات
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=نموذج فاتورة Crabe. نموذج الفاتورة كاملة (دعم الخيار الضريبة على القيمة المضافة ، والخصومات ، وشروط الدفع ، والشعار ، الخ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=عودة عدد مع الشكل syymm NNNN عن الفواتير القياسية و٪ syymm-NNNN لتلاحظ الائتمان حيث هو YY العام٪، مم هو الشهر وnnnn هو تسلسل مع أي انقطاع وعدم العودة إلى 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=تم حذف الفاتورة
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index dc042aade07..b99db35c99f 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -1,14 +1,14 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=نقطة بيع
-CashDesk=نقطة بيع
+CashDeskMenu=نقطة البيع
+CashDesk=نقطة البيع
 CashDeskBankCash=الحساب المصرفي (نقدا)
 CashDeskBankCB=الحساب المصرفي (بطاقة)
 CashDeskBankCheque=الحساب المصرفي (شيك)
 CashDeskWarehouse=مستودع
 CashdeskShowServices=بيع الخدمات
 CashDeskProducts=المنتجات
-CashDeskStock=الأوراق المالية
-CashDeskOn=في
+CashDeskStock=مخزون
+CashDeskOn=على
 CashDeskThirdParty=طرف ثالث
 ShoppingCart=عربة التسوق
 NewSell=بيع جديد
@@ -22,7 +22,7 @@ NoArticle=لا يوجد عناصر
 Identification=التعريف
 Article=عنصر
 Difference=فرق
-TotalTicket=مجموع التذكرة
+TotalTicket=إجمالي التذكرة
 NoVAT=ليس هناك ضريبة قيمة مضافة لهذا البيع
 Change=باقي المستلم
 BankToPay=حساب الدفع
@@ -30,5 +30,15 @@ ShowCompany=عرض الشركة
 ShowStock=عرض المستودع
 DeleteArticle=انقر لإزالة هذا العنصر
 FilterRefOrLabelOrBC=بحث (المرجع / الملصق)
-UserNeedPermissionToEditStockToUsePos=لقد طلبت أن ينخفض ​​المخزون عند إنشاء الفاتورة، لذلك المستخدم التي يستخدم نقطة البيع يحتاج إلى امتلاك الصلاحيات لتعديل المخزون.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=طابعة إيصال دوليبار
+PointOfSale=نقاط البيع
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index fd39ed56f00..14ede956be0 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=اتصال هاتفي
 ActionAC_FAX=إرسال فاكس
 ActionAC_PROP=إرسال اقتراح
 ActionAC_EMAIL=ارسال بريد الكتروني
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=اجتماعات
 ActionAC_INT=تدخل على الموقع
 ActionAC_FAC=ارسال الفواتير
@@ -72,8 +73,8 @@ StatusProsp=احتمال وضع
 DraftPropals=صياغة مقترحات تجارية
 NoLimit=لا حدود
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ar_SA/dict.lang b/htdocs/langs/ar_SA/dict.lang
index 23ebe84ebba..d89839836ac 100644
--- a/htdocs/langs/ar_SA/dict.lang
+++ b/htdocs/langs/ar_SA/dict.lang
@@ -116,7 +116,7 @@ CountryHM=واستمع وجزر ماكدونالد
 CountryVA=الكرسي الرسولي (دولة الفاتيكان)
 CountryHN=هندوراس
 CountryHK=هونج كونج
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=الهند
 CountryID=اندونيسيا
 CountryIR=إيران
@@ -131,7 +131,7 @@ CountryKI=كيريباس
 CountryKP=كوريا الشمالية
 CountryKR=كوريا الجنوبية
 CountryKW=الكويت
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=لاوس
 CountryLV=لاتفيا
 CountryLB=لبنان
@@ -160,7 +160,7 @@ CountryMD=مولدافيا
 CountryMN=منغوليا
 CountryMS=مونتسرات
 CountryMZ=موزامبيق
-CountryMM=Birmania (ميانمار)
+CountryMM=Myanmar (Burma)
 CountryNA=ناميبيا
 CountryNR=ناورو
 CountryNP=نيبال
@@ -223,7 +223,7 @@ CountryTO=تونجا
 CountryTT=ترينيداد وتوباغو
 CountryTR=تركيا
 CountryTM=تركمانستان
-CountryTC=الأتراك وجزر Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=توفالو
 CountryUG=أوغندا
 CountryUA=أوكرانيا
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=موريشيوس روبية
 CurrencySingMUR=موريشيوس روبية
 CurrencyNOK=النرويجية بالكرون
-CurrencySingNOK=الكرونة النرويجية
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=دينار
 CurrencySingTND=الدينار التونسي
 CurrencyUSD=الدولار الأمريكي
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=كلمة الفم
 DemandReasonTypeSRC_PARTNER=شريك
 DemandReasonTypeSRC_EMPLOYEE=الموظف
 DemandReasonTypeSRC_SPONSORING=رعاية
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=شكل 4A0
 PaperFormatEU2A0=شكل 2A0
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index 708f22d5a09..0450e0d86f2 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=ملاحظة : الوثائق في الدليل
+ECMNbOfDocs=No. of documents in directory
 ECMSection=دليل
 ECMSectionManual=دليل دليل
 ECMSectionAuto=الدليل الآلي
@@ -34,6 +34,8 @@ ECMDocsByProjects=المستندات المرتبطة بالمشاريع
 ECMDocsByUsers=وثائق مرتبطة المستخدمين
 ECMDocsByInterventions=وثائق مرتبطة بالتدخلات
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=لا الدليل
 ShowECMSection=وتظهر الدليل
 DeleteSection=إزالة الدليل
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 99ead73977e..c4b4c1cdb59 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=العميل SOAP فشلت مع الخطأ '٪ ق'
 ErrorGlobalVariableUpdater5=لا متغير عمومي مختارة
 ErrorFieldMustBeANumeric=يجب أن يكون <b>حقل٪ الصورة</b> قيمة رقمية
 ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
 WarningMandatorySetupNotComplete=لا يتم تعريف معلمات الإعداد إلزامية حتى الآن
diff --git a/htdocs/langs/ar_SA/help.lang b/htdocs/langs/ar_SA/help.lang
index 4510c6ed7d6..e4944b4b5b5 100644
--- a/htdocs/langs/ar_SA/help.lang
+++ b/htdocs/langs/ar_SA/help.lang
@@ -1,26 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=منتدى / الدعم ويكي
-EMailSupport=رسائل البريد الإلكتروني لدعم
-RemoteControlSupport=الانترنت في الوقت الحقيقي / النائية الدعم
-OtherSupport=الدعم الأخرى
-ToSeeListOfAvailableRessources=للاتصال / انظر الموارد المتاحة :
+CommunitySupport=منتدى / ويكي الدعم
+EMailSupport=دعم رسائل البريد الإلكتروني
+RemoteControlSupport=الوقت الحقيقي عبر الإنترنت / الدعم عن بعد
+OtherSupport=دعم آخر
+ToSeeListOfAvailableRessources=للاتصال / الاطلاع على الموارد المتاحة:
 HelpCenter=مركز المساعدة
-DolibarrHelpCenter=Dolibarr مركز المساعدة والدعم
-ToGoBackToDolibarr=Otherwise, click <a href=بخلاف ذلك ، انقر <a href="%s">هنا لاستخدام Dolibarr</a>
-TypeOfSupport=مصدر الدعم
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=المجتمع (مجاني)
-TypeSupportCommercial=التجارية
+TypeSupportCommercial=تجاري
 TypeOfHelp=نوع
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=هل تحتاج إلى مساعدة أو دعم؟
 Efficiency=الكفاءة
-TypeHelpOnly=فقط مساعدة
-TypeHelpDev=+ المساعدة على التنمية
-TypeHelpDevForm=مساعدة التنمية + + تشكيل
-ToGetHelpGoOnSparkAngels1=ويمكن أن توفر بعض الشركات سريعة (ما الفورية) ، وزيادة كفاءة شبكة الإنترنت عن طريق دعم السيطرة على جهاز الكمبيوتر الخاص بك. مساعدات من هذا القبيل يمكن الاطلاع على الموقع الإلكتروني <b>ل ٪</b> :
-ToGetHelpGoOnSparkAngels3=كما يمكنك الذهاب الى قائمة المدربين كل ما هو متاح لDolibarr ، لهذا اضغط على زر
-ToGetHelpGoOnSparkAngels2=في بعض الأحيان ، لا يوجد أي شركة المتاحة في الوقت الراهن تقوم بإجراء البحث ، لذلك اعتقد تغيير فلتر للبحث عن "توافر جميع". ستتمكن من ارسال المزيد من الطلبات.
-BackToHelpCenter=Otherwise, click here to go <a href=بخلاف ذلك ، انقر هنا للذهاب <a href="%s">الى الصفحة الرئيسية لمركز المساعدة.</a>
-LinkToGoldMember=تستطيع الاتصال به من قبل المدرب مختار مسبقا لغتك Dolibarr (٪) عن طريق النقر فوق القطعة له (والحد الاعلى لسعر يتم تحديثها تلقائيا) :
+TypeHelpOnly=المساعدة فقط
+TypeHelpDev=مساعدة + التنمية
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=اللغات المدعومة
-SubscribeToFoundation=مساعدة مشروع Dolibarr، الاشتراك في الجمعية
-SeeOfficalSupport=للحصول على الدعم Dolibarr الرسمي في لغتك: <br> <b><a href="%s" target="_blank">٪ الصورة</a></b>
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=للحصول على دعم رسمي من دوليبار بلغتك: <br> <b> <a href="%s" target="_blank"> %s </a></b>
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index a98958cb808..4ca03f4f867 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=أوراق
-CPTitreMenu=أوراق
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=البيان الشهري
 MenuAddCP=طلب إجازة جديدة
-NotActiveModCP=يجب تمكين أوراق حدة لمشاهدة هذه الصفحة.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=تقديم طلب إجازة
 DateDebCP=تاريخ البدء
 DateFinCP=نهاية التاريخ
@@ -15,13 +15,18 @@ ApprovedCP=وافق
 CancelCP=ألغيت
 RefuseCP=رفض
 ValidatorCP=Approbator
-ListeCP=قائمة الأوراق
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=سيتم مراجعتها من قبل
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=وصف
 SendRequestCP=إنشاء طلب إجازة
 DelayToRequestCP=يجب أن يتم ترك طلبات في <b>اليوم</b> أقل <b>ق٪ (ق)</b> من قبلهم.
-MenuConfCP=Balance of leaves
-SoldeCPUser=يترك التوازن <b>هو%s</b> أيام.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=يجب تحديد تاريخ انتهاء أكبر من تاريخ البدء.
 ErrorSQLCreateCP=حدث خطأ SQL أثناء إنشاء:
 ErrorIDFicheCP=حدث خطأ غير موجود على طلب الإجازة.
@@ -30,7 +35,14 @@ ErrorUserViewCP=غير مصرح لك قراءة طلب إجازة هذا.
 InfosWorkflowCP=معلومات سير العمل
 RequestByCP=طلبت
 TitreRequestCP=ترك الطلب
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=عدد أيام عطلة تستهلك
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=تحرير
 DeleteCP=حذف
 ActionRefuseCP=رفض
@@ -59,6 +71,7 @@ DateRefusCP=تاريخ الرفض
 DateCancelCP=تاريخ الإلغاء
 DefineEventUserCP=تعيين إجازة استثنائية لمستخدم
 addEventToUserCP=تعيين إجازة
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=سبب
 UserCP=مستخدم
 ErrorAddEventToUserCP=حدث خطأ أثناء إضافة إجازة استثنائية.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=تم التحديث بنجاح.
 Module27130Name= إدارة طلبات الإجازة
 Module27130Desc= إدارة طلبات الإجازة
@@ -94,7 +112,7 @@ NoticePeriod=فترة إشعار
 HolidaysToValidate=التحقق من صحة طلبات الإجازة
 HolidaysToValidateBody=وفيما يلي طلب إجازة للتحقق من صحة
 HolidaysToValidateDelay=وهذا الطلب إجازة أن تتم في غضون أقل من٪ الصورة أيام.
-HolidaysToValidateAlertSolde=المستخدم الذي جعل هذا ترك reques لم يكن لديك ما يكفي من الأيام المتاحة.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=طلبات إجازة التحقق من صحة
 HolidaysValidatedBody=تم التحقق من صحة طلب إجازة لمدة٪ s إلى٪ s.
 HolidaysRefused=طلب نفى
@@ -103,4 +121,9 @@ HolidaysCanceled=إلغاء طلب الأوراق
 HolidaysCanceledBody=تم إلغاء طلب إجازة لمدة٪ s إلى٪ s.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=اذهب إلى <strong>الصفحة الرئيسية - إعداد - معاجم - نوع من الأوراق</strong> لإعداد أنواع مختلفة من الأوراق.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index e5c63dd9490..5edd6c149b9 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=فقط اتبع التعليمات خطوة بخطوة.
 MiscellaneousChecks=التحقق من الشروط الأساسية
 ConfFileExists=ملف الإعداد <b>%s</b> موجود  مسبقاً
-ConfFileDoesNotExistsAndCouldNotBeCreated=ملف الإعداد <b>%s</b> مفقود ولا يمكن إنشائه.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=يمكن إنشاء ملف الإعداد <b>%s</b>
-ConfFileIsNotWritable=لا يمكن الكتابة الى ملف الإعداد <b>%s</b>. تحقق من الصلاحيات. اذا كان هذا التنصيب هو الأول، تحقق من أن السيرفر قادر ولديه جميع صلاحيات الكتابة والقراءة خلال عملية التنصيب، مثال: (chmod 666) لمستخدمي سيرفرات يونكس.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=ملف الإعداد <b>%s</b> قابل للكتابة.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=إعادة تحميل جميع المعلومات من ملف الإعداد.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و GET.
-PHPSupportPOSTGETKo=من المحتمل أن نسخة الـ PHP لديك لاتدعم وظائف POST - GET. تحقق من <b>variables_order</b> في ملف php.ini
-PHPSupportGD=يدعم اصدار الـ PHP هذا وظائف GD الرسومية.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=يدعم هذاا الاصدار من PHP وظائف الترميز UTF8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة في  PHP الى <b>%s</b> . من المفترض ان تكون كافية.
-PHPMemoryTooLow=الحد الأقصى الخاص بك PHP دورة الذاكرة ومن المقرر <b>٪ ق</b> بايت. لهذا ينبغي أن يكون منخفضا جدا. تغيير <b>php.ini</b> وضع <b>memory_limit</b> المعلم إلى ما لا يقل عن <b>٪ ق</b> بايت.
-Recheck=اضغط هنا لمزيد من الاختبار ذو معنى
-ErrorPHPDoesNotSupportSessions=PHP تركيب الخاص بك لا يدعم الدورات. هذه الميزة هو مطلوب لجعل العمل Dolibarr. التحقق من اتصالك PHP الإعداد.
-ErrorPHPDoesNotSupportGD=PHP تركيب الخاص بك لا يدعم وظيفة بيانية ش ج. لا الرسم البياني سيكون متاحا.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=PHP تركيب الخاص بك لا يدعم UTF8 المهام. Dolibarr لا يمكن أن تعمل بشكل صحيح. لحل هذه قبل تثبيت Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=دليل ٪ ق لا يوجد.
-ErrorGoBackAndCorrectParameters=العودة إلى الوراء وتصحيح الخطأ البارامترات.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=قد تكون لديكم مطبوعة خاطئة قيمة معلمة '٪ ق.
 ErrorFailedToCreateDatabase=فشل إنشاء قاعدة بيانات '٪ ق.
 ErrorFailedToConnectToDatabase=فشل في الاتصال بقاعدة البيانات '٪ ق.
 ErrorDatabaseVersionTooLow=إصدار قاعدة البيانات  (s%) قديمة جدا. مطلوب نسخة s% أو أعلى
 ErrorPHPVersionTooLow=PHP نسخة قديمة جدا. النسخة ٪ ق هو مطلوب.
-ErrorConnectedButDatabaseNotFound=خادم الصدد الى قاعدة البيانات ولكن النجاح في '٪ ق' لم يتم العثور عليه.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=قاعدة البيانات '٪ ق' موجود بالفعل.
-IfDatabaseNotExistsGoBackAndUncheckCreate=إذا كان لا وجود قاعدة بيانات ، والتأكد من العودة الخيار "إنشاء قاعدة بيانات".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=إذا كانت قاعدة البيانات موجود بالفعل ، من العودة وإلغاء "إنشاء قاعدة بيانات" الخيار.
-WarningBrowserTooOld=نسخة قديمة جدا من المتصفح. ننصحك جيدا بترقية متصفحك إلى نسخة حديثة عن فايرفوكس، كروم أو أوبرا
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP الإصدار
 License=الترخيص باستعمال
 ConfigurationFile=ملفات
@@ -45,22 +45,23 @@ DolibarrDatabase=قاعدة بيانات Dolibarr
 DatabaseType=قاعدة بيانات من نوع
 DriverType=سائق نوع
 Server=الخادم
-ServerAddressDescription=الملكية الفكرية في اسم أو عنوان خادم قاعدة البيانات ، وعادة 'localhost' عندما يستضيف خادم قاعدة البيانات على نفس الخادم من خدمة الويب
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=قاعدة بيانات الميناء. تبقي فارغة إذا كانت غير معروفة.
 DatabaseServer=خادم قاعدة البيانات
 DatabaseName=اسم قاعدة البيانات
-DatabasePrefix=قاعدة بيانات بادئة الجدول
-AdminLogin=ادخل لDolibarr مدير قاعدة البيانات. تبقي فارغة إذا لم يذكر اسمه في اتصال
-PasswordAgain=أعد كتابة كلمة المرور مرة ثانية
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Dolibarr كلمة السر لمدير قاعدة البيانات. تبقي فارغة إذا لم يذكر اسمه في اتصال
 CreateDatabase=إنشاء قاعدة بيانات
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=قاعدة بيانات -- وصول مستخدم الكومبيوتر ذو الصلاحيات العليا
-CheckToCreateDatabase=المربع إذا كان لا وجود قاعدة بيانات ، ويجب تهيئة. <br> في هذه الحالة ، يجب عليك ملء ادخل كلمة السر لحساب المستعملين المتميزين في أسفل هذه الصفحة.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=ادخل يسمح للمستخدم لإنشاء قواعد بيانات جديدة أو المستخدمين الجدد ، وإذا كانت غير مجدية وقاعدة البيانات وقاعدة البيانات ادخل موجود بالفعل (مثل عندما كنت استضافته استضافة ويب).
-KeepEmptyIfNoPassword=ترك فارغا إذا لم المستخدم كلمة السر (تجنب هذا؟)
-SaveConfigurationFile=إنقاذ القيم
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=اتصال الخادم
 DatabaseCreation=إنشاء قاعدة بيانات
 CreateDatabaseObjects=إنشاء قاعدة بيانات الأجسام
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=إنشاء الخارجية مفاتيح الأرقام
 OtherKeysCreation=مفاتيح الخارجية وإنشاء الفهارس
 FunctionsCreation=إنشاء وظائف
 AdminAccountCreation=مدير ادخل إنشاء
-PleaseTypePassword=الرجاء كتابة كلمة المرور ، وكلمات السر فارغة لا يسمح!
-PleaseTypeALogin=اكتب من فضلك ادخل!
-PasswordsMismatch=وتختلف كلمات السر ، يرجى المحاولة مرة أخرى!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=نهاية الإعداد
 SystemIsInstalled=هذا التثبيت الكامل.
 SystemIsUpgraded=وقد تم تطوير Dolibarr بنجاح.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=عليك تكوين Dolibarr لتناسب احتياج
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=الذهاب إلى Dolibarr
 GoToSetupArea=الذهاب إلى Dolibarr (مجال الإعداد)
-MigrationNotFinished=نسخة من قاعدة البيانات الخاصة بك لا يصل تماما حتى الآن ، لذلك سيكون لديك لتشغيل عملية الترقية مرة أخرى.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=الذهاب لتحديث الصفحة مرة أخرى
 WithNoSlashAtTheEnd=بدون خفض "/" في نهاية
-DirectoryRecommendation=وrecommanded به لاستخدام دليل خارج الدليل الخاص من صفحات موقعك.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=موجود بالفعل
 DolibarrAdminLogin=ادخل Dolibarr مشرف
-AdminLoginAlreadyExists=Dolibarr حساب مشرف <b>'٪ ق'</b> موجود بالفعل.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=تحذير ، لأسباب أمنية ، بعد تثبيت أو تحديث كاملة ، يجب إزالة <b>تثبيت أو إعادة تسمية الدليل على install.lock من أجل تجنب استخدام الخبيثة.</b>
-FunctionNotAvailableInThisPHP=لا تتوفر على هذا PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=اختار الهجرة سكريبت
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=السيناريو تجهيز
 ChooseYourSetupMode=اختر طريقة الإعداد وانقر على "ابدأ"...
 FreshInstall=تركيب جديد
-FreshInstallDesc=استخدام هذا الأسلوب إذا كان هذا هو أول تركيب. إذا لم يكن هذا الوضع لا يمكن إصلاح تثبيت سابقة غير مكتملة ، ولكن إذا كنت ترغب في تحديث الإصدار الخاص بك ، اختر "ترقية" واسطة.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=ترقية
 UpgradeDesc=استخدام هذه الطريقة إذا كنت قد حلت محل القديمة Dolibarr الملفات من الملفات مع إصدار أحدث. وهذا من شأنه رفع مستوى قاعدة البيانات والبيانات.
 Start=يبدأ
 InstallNotAllowed=الإعداد غير مسموح به <b>conf.php</b> الاذونات
 YouMustCreateWithPermission=يجب إنشاء ملف ق ٪ ومجموعة الكتابة على أذونات لملقم الويب أثناء عملية التثبيت.
-CorrectProblemAndReloadPage=يرجى تحديد المشكلة والصحافة F5 لإعادة تحميل الصفحة.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=بالفعل هاجر
 DatabaseVersion=قاعدة بيانات النسخة
 ServerVersion=خادم قاعدة البيانات النسخة
 YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، والسماح لخادم الويب أن يكتبوا فيه.
 DBSortingCollation=طابع الفرز بغية
-YouAskDatabaseCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع المستخدم أذونات <b>٪ ق.</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=كنت أسأل لإنشاء قاعدة بيانات ادخل <b>٪ ق</b> ، ولكن لهذا ، Dolibarr الحاجة الى الاتصال بخادم <b>٪ ق</b> السوبر مع أذونات المستخدم <b>٪ ق.</b>
-BecauseConnectionFailedParametersMayBeWrong=كما فشلت الصدد ، أو استضافة السوبر معالم المستخدم يجب أن يكون على خطأ.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphelins من اكتشاف طريقة الدفع ق ٪
 RemoveItManuallyAndPressF5ToContinue=إزالته يدويا واضغط F5 للمتابعة.
 FieldRenamed=تغيير اسم الحقل
-IfLoginDoesNotExistsCheckCreateUser=اذا ادخل لا يوجد حتى الآن ، يجب عليك التحقق من خيار "تكوين المستخدم"
-ErrorConnection=الخادم <b>"٪ ل"</b> اسم قاعدة بيانات <b>"٪ ل"</b> ادخل <b>"٪ ل"</b> أو كلمة سر قاعدة البيانات قد تكون خاطئة أو PHP العميل نسخة قديمة جدا ويمكن مقارنة مع قاعدة البيانات نسخة.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=وأوصت لتثبيت اختيار النسخة <b>٪ المستندات</b> الخاصة بك من النسخة الحالية <b>ل ٪</b>
 InstallChoiceSuggested=<b>اقترح تثبيت اختيار المثبت.</b>
-MigrateIsDoneStepByStep=النسخة المستهدفة (%s) لديها فجوة من إصدارات عديدة، لذلك تثبيت المعالج سوف يعود تشير إلى الهجرة مرة القادمة سوف يتم الانتهاء من هذا واحد.
-CheckThatDatabasenameIsCorrect=تأكد من أن اسم قاعدة البيانات <b>"%s"</b> هو الصحيح.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=وإذا كان هذا الاسم هو الصحيح وأنه لا وجود قاعدة بيانات حتى الآن ، ويجب التحقق من خيار "إنشاء قاعدة بيانات".
 OpenBaseDir=بي openbasedir المعلمة
-YouAskToCreateDatabaseSoRootRequired=يمكنك التحقق من مربع "إنشاء قاعدة بيانات". لهذا ، تحتاج إلى توفير الدخول وكلمة السر من المستعملين المتميزين (الجزء السفلي من النموذج).
-YouAskToCreateDatabaseUserSoRootRequired=يمكنك التحقق من مربع "إنشاء قاعدة بيانات مالك". لهذا ، تحتاج إلى توفير الدخول وكلمة السر من المستعملين المتميزين (الجزء السفلي من النموذج).
-NextStepMightLastALongTime=الخطوة الحالية قد تستمر لعدة دقائق. ويرد الرجاء الانتظار حتى الشاشة التالية تماما قبل الشروع في الاستمرار.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=ترحيل الشحن لتخزين طلبات العملاء
 MigrationShippingDelivery=ترقية تخزين الشحن
 MigrationShippingDelivery2=ترقية تخزين الشحن 2
 MigrationFinished=الانتهاء من الهجرة
-LastStepDesc=<strong>الخطوة الأخيرة</strong> : تعريف المستخدم وكلمة السر هنا كنت تخطط لاستخدامها للاتصال البرمجيات. لا تفقد هذا كما هو حساب لإدارة جميع الآخرين.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=تفعيل وحدة %s
 ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=إصدار قاعدة البيانات الخاصة بك هي%s.   يوجد بعض الخلل أدى لفقدان بعض البيانات إذا قمت بإجراء تغيير هيكلي على قاعدة البيانات الخاصة بك، مثل كان مطلوبا خلال عملية ترحيل البيانات. لن يسمح لك بترحيل البيانات حتى تقوم بترقية قاعدة البيانات الخاصة بك إلى إصدار أعلى موثوق  (قائمة الاصدارات الموثوقة : %s)
-KeepDefaultValuesWamp=استخدام معالج الإعداد DoliWamp ، حتى القيم المقترحة هنا بالفعل الأمثل. تغييرها إلا إذا كنت تعرف ما تفعله.
-KeepDefaultValuesDeb=يمكنك استخدام معالج الإعداد Dolibarr من أوبونتو أو حزمة ديبيان ، لذلك القيم المقترحة هنا هي الأمثل بالفعل. يجب أن تكتمل إلا كلمة السر للمالك قاعدة البيانات لإنشاء. تغيير معلمات أخرى إلا إذا كنت تعرف ما تفعله.
-KeepDefaultValuesMamp=استخدام معالج الإعداد DoliMamp ، حتى القيم المقترحة هنا بالفعل الأمثل. تغييرها إلا إذا كنت تعرف ما تفعله.
-KeepDefaultValuesProxmox=يمكنك استخدام معالج إعداد Dolibarr من الأجهزة الظاهرية Proxmox، بحيث يتم تحسين بالفعل القيم المقترحة هنا. تغييرها إلا إذا كنت تعرف ما تفعله.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=بيانات الهجرة لأغراض تجارية اقتراحات
 MigrationInvoice=بيانات الهجرة لعملاء الفواتير
 MigrationContract=بيانات الهجرة للحصول على عقود
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=تحديث ناجحة
 MigrationUpdateFailed=فشلت عملية تحديث
 MigrationRelationshipTables=بيانات الهجرة للجداول العلاقة (%s)
 MigrationPaymentsUpdate=تصحيح بيانات الدفع
@@ -163,9 +164,9 @@ MigrationContractsUpdate=تصحيح بيانات العقد
 MigrationContractsNumberToUpdate=٪ ق العقد (ق) لتحديث
 MigrationContractsLineCreation=عقد إنشاء خط لعقد المرجع ق ٪
 MigrationContractsNothingToUpdate=لا أكثر مما ينبغي فعله
-MigrationContractsFieldDontExist=الحقل fk_facture لا وجود بعد الآن. لا يمكن تنفيذ اي شيء.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=عقد فارغ تصحيح التاريخ
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=أي عقد حتى الآن لتصحيح فارغة
 MigrationContractsEmptyCreationDatesNothingToUpdate=إنشاء أي عقد لتصحيح التاريخ
 MigrationContractsInvalidDatesUpdate=سوء قيمة العقد تصحيح التاريخ
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=تسليم تحديث
 MigrationStockDetail=تحديث قيمة المخزون من المنتجات
 MigrationMenusDetail=تحديث القوائم الديناميكية الجداول
 MigrationDeliveryAddress=تتناول آخر التطورات في تسليم شحنات
-MigrationProjectTaskActors=بيانات الهجرة لllx_projet_task_actors الجدول
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=بيانات fk_user_resp مجال الهجرة من llx_projet لllx_element_contact
 MigrationProjectTaskTime=تحديث الوقت الذي يقضيه في ثوان
 MigrationActioncommElement=تحديث البيانات على الإجراءات
 MigrationPaymentMode=بيانات الهجرة لطريقة الدفع
 MigrationCategorieAssociation=تحديث الفئات
-MigrationEvents=الترحيل من الأحداث لإضافة مالك الحدث في جدول الاحالة
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=إعادة تحديث الوحدات %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=عرض خيارات غير متوفرة
-HideNotAvailableOptions=إخفاء خيارات غير متوفرة
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index cb5580a3616..0ca82c6bec6 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=اتصالات لهذا الطرف الثالث
 ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف الثالث
 AddressesForCompany=عناوين لهذا الطرف الثالث
 ActionsOnCompany=الأحداث حول هذا الطرف الثالث
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=الأحداث عن هذا العضو
 ActionsOnProduct=Events about this product
 NActionsLate=٪ في وقت متأخر الصورة
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=تقرير حساب
 ExpenseReports=تقارير المصاريف
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index ec0fcb50954..55a27196753 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -83,6 +83,7 @@ LinkedObject=ربط وجوه
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=العنوان
 WEBSITE_DESCRIPTION=الوصف
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/ar_SA/paybox.lang b/htdocs/langs/ar_SA/paybox.lang
index 8d32deeb39b..75c1a3961bd 100644
--- a/htdocs/langs/ar_SA/paybox.lang
+++ b/htdocs/langs/ar_SA/paybox.lang
@@ -1,38 +1,39 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=إعداد وحدة PayBox
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target=هذا نموذج للسماح بعرض الصفحات على دفع <a href="http://www.paybox.com" target="_blank">Paybox</a> الواحد. هذه يمكن استخدامها لدفع حر أو لدفع مبلغ معين على وجوه Dolibarr (الفاتورة ، والنظام ،...)
-FollowingUrlAreAvailableToMakePayments=فيما يلي عناوين المواقع المتاحة لعرض هذه الصفحة زبون لتسديد دفعة Dolibarr على الأجسام
-PaymentForm=شكل الدفع
-WelcomeOnPaymentPage=ونحن نرحب على خدمة الدفع عبر الإنترنت
-ThisScreenAllowsYouToPay=تتيح لك هذه الشاشة إجراء الدفع الإلكتروني إلى ٪ s.
-ThisIsInformationOnPayment=هذه هي المعلومات عن الدفع للقيام
+PayBoxDesc=تعرض صفحات نموذج الوحدة هذه الدفعات على <a href="http://www.paybox.com" target="_blank"> Paybox</a> من قبل العملاء. هذا يمكن استخدامها للدفع مجانا أو للدفع على عنصر دوليبار معين (الفاتورة، طلب، ...)
+FollowingUrlAreAvailableToMakePayments=تتوفر عناوين URL التالية لتقديم صفحة إلى عميل لإجراء دفعة على عناصر دوليبار
+PaymentForm=نموذج الدفع
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=هذه الشاشة تسمح لك بإجراء الدفع عبر الإنترنت إلى %s.
+ThisIsInformationOnPayment=هذه هي معلومات عن الدفع للقيام به
 ToComplete=لإكمال
-YourEMail=البريد الالكتروني لتأكيد الدفع
-Creditor=الدائن
-PaymentCode=دفع رمز
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
-ToPay=هل لدفع
-YouWillBeRedirectedOnPayBox=سوف يتم نقلك على تأمين Paybox لك صفحة لإدخال معلومات بطاقة الائتمان
+YourEMail=البريد الإلكتروني لتلقي تأكيد الدفع
+Creditor=دائن
+PaymentCode=رمز الدفع
+PayBoxDoPayment=الدفع باستخدام بطاقة الائتمان أو بطاقة السحب الآلي (Paybox)
+ToPay=القيام بالدفع
+YouWillBeRedirectedOnPayBox=سيتم إعادة توجيهك على صفحة Paybox الأمنة لإدخال معلومات بطاقة الائتمان الخاصة بك
 Continue=التالي
-ToOfferALinkForOnlinePayment=عنوان دفع %s
-ToOfferALinkForOnlinePaymentOnOrder=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للأمر
-ToOfferALinkForOnlinePaymentOnInvoice=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للفاتورة
-ToOfferALinkForOnlinePaymentOnContractLine=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم للحصول على عقد خط
-ToOfferALinkForOnlinePaymentOnFreeAmount=عنوان لتقديم المستندات ٪ الدفع الإلكتروني واجهة المستخدم لمبلغ حرة
-ToOfferALinkForOnlinePaymentOnMemberSubscription=عنوان الموقع لتقديم الدفع عبر الإنترنت %s واجهة المستخدم للاشتراك عضو
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=يمكنك أيضا إضافة رابط المعلم <b>= & علامة</b> على أي من <i><b>قيمة</b></i> تلك عنوان (مطلوب فقط لدفع الحر) الخاصة بك لإضافة تعليق دفع الوسم.
-SetupPayBoxToHavePaymentCreatedAutomatically=الإعداد الخاص بك مع رابط PayBox <b>٪ ق</b> قد تنشأ تلقائيا عند دفع يصادق عليها paybox.
-YourPaymentHasBeenRecorded=هذه الصفحة يؤكد أنه قد تم تسجيلها دفعتك. شكرا لك.
-YourPaymentHasNotBeenRecorded=يمكنك دفع لم يسجل وتم إلغاء الصفقة. شكرا لك.
-AccountParameter=حساب المعلمات
-UsageParameter=استخدام المعلمات
-InformationToFindParameters=مساعدة للعثور على معلومات حسابك %s
-PAYBOX_CGI_URL_V2=عزيزي من وحدة لدفع CGI Paybox
+ToOfferALinkForOnlinePayment=عنوان URL للدفع %s
+ToOfferALinkForOnlinePaymentOnOrder=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s لأمر العميل
+ToOfferALinkForOnlinePaymentOnInvoice=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s لفاتورة العميل
+ToOfferALinkForOnlinePaymentOnContractLine=URL لتقديم %s واجهة مستخدم الدفع عبر الإنترنت لخط العقد
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL لتقديم واجهة مستخدم الدفع عبر الإنترنت %s مقابل مبلغ مجاني
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL لتقديم %s واجهة مستخدم الدفع عبر الإنترنت للحصول على اشتراك عضو
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
+YouCanAddTagOnUrl=يمكنك أيضا إضافة معلمة عنوان url <b>&tag=<i>value</i></b> إلى أي من عنوان urlهذا (مطلوب فقط للدفع المجاني) لإضافة علامة تعليق الدفع الخاصة بك.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=تؤكد هذه الصفحة أنه قد تم تسجيل دفعتك. شكرا لكم.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=معلمات الحساب
+UsageParameter=معلمات الاستخدام
+InformationToFindParameters=مساعدة للعثور على معلومات الحساب الخاص بك %s
+PAYBOX_CGI_URL_V2=Url من Paybox CGI وحدة للدفع
 VendorName=اسم البائع
-CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع
-NewPayboxPaymentReceived=دفع Paybox الجديدة التي وردت
+CSSUrlForPaymentForm=CSS style sheet url  لنموذج الدفع
+NewPayboxPaymentReceived=تلقى الدفع Paybox الجديد
 NewPayboxPaymentFailed=دفع Paybox جديد حاول ولكنه فشل
-PAYBOX_PAYONLINE_SENDEMAIL=البريد الإلكتروني لتحذير بعد دفع (نجاح أو فشل)
+PAYBOX_PAYONLINE_SENDEMAIL=البريد الإلكتروني للانذار بعد (نجاح أو فشل) الدفع 
 PAYBOX_PBX_SITE=قيمة PBX SITE
 PAYBOX_PBX_RANG=قيمة PBX رانج
 PAYBOX_PBX_IDENTIFIANT=قيمة PBX ID
diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
index a8f88898022..87bb5e8458d 100644
--- a/htdocs/langs/ar_SA/propal.lang
+++ b/htdocs/langs/ar_SA/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=وقعت (لمشروع القانون)
 PropalStatusNotSigned=لم يتم التوقيع (مغلقة)
 PropalStatusBilled=فواتير
 PropalStatusDraftShort=مسودة
-PropalStatusValidatedShort=التحقق من صحة
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=مغلقة
 PropalStatusSignedShort=وقعت
 PropalStatusNotSignedShort=لم يتم التوقيع
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal ق لم يتم العثور على ٪
 AddToDraftProposals=إضافة إلى صياغة اقتراح
 NoDraftProposals=أي مشاريع اقتراحات
 CopyPropalFrom=اقتراح إنشاء التجارية عن طريق نسخ وجود اقتراح
-CreateEmptyPropal=إنشاء خاليا التجارية vierge مقترحات أو من قائمة المنتجات / الخدمات
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=تقصير مدة صلاحية اقتراح التجارية (أيام)
-UseCustomerContactAsPropalRecipientIfExist=استخدام العميل عنوان الاتصال إذا حددت بدلا من التصدي لطرف ثالث حسب الاقتراح المستفيدة معالجة
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=اقتراح استنساخ التجارية
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=اتصل العملاء اقتراح متا
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=اقتراح نموذج كامل (logo...)
+DocModelCyanDescription=اقتراح نموذج كامل (logo...)
 DefaultModelPropalCreate=إنشاء نموذج افتراضي
 DefaultModelPropalToBill=القالب الافتراضي عند إغلاق الأعمال المقترح (أن الفاتورة)
 DefaultModelPropalClosed=القالب الافتراضي عند إغلاق الأعمال المقترح (فواتير)
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 0b9bd8ad92c..0c5ae03969c 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=رمز
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=قرأ
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 310cdfe0f79..c9dd36d00ac 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature инвалиди в демо
 FeatureAvailableOnlyOnStable=Функционалност само налична на официалната стабилна версия.
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Можете да намерите още модули за изтегляне на външни уеб сайтове в интернет ...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Намери външно приложение/модул
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Mutli модули инструменти
 ModuleFamilyExperimental=Експериментални модули
 ModuleFamilyFinancial=Финансови Модули (Счетоводство/Каса)
 ModuleFamilyECM=Електронно Управление на Съдържанието (ECM)
-ModuleFamilyPortal=Уеб сайтове и друго фронтално приложение
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Интерфейси със външни системи.
 MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Кликнете, за да се покаже описа
 DependsOn=This module needs the module(s)
 RequiredBy=Този модул се изисква от модул (и)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Разрешете използването на персонализирани стойности по подразбиране
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Потребители и групи
 Module0Desc=Управление на потребители / служители и групи
 Module1Name=Third Parties
-Module1Desc=Фирми и управление на контакти
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Търговски
 Module2Desc=Търговско управление
 Module10Name=Счетоводство
@@ -501,7 +501,7 @@ Module23Desc=Наблюдение на консумацията на енерг
 Module25Name=Поръчки от клиенти
 Module25Desc=Управление на поръчка на клиента
 Module30Name=Фактури
-Module30Desc=Фактура и управление на кредитно известие за клиентите. Фактура за управление на доставчици
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Доставчици
 Module40Desc=Доставчици и управление на покупки (поръчки за покупка и таксуване)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Размер на данъчните печати
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Тип страници / контейнери на уебсайтове
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Етикет на документи
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=В края на месеца
 CurrentNext=Настоящ / Следваща
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Събития одит на сигурността
-Audit=Проверка
+Audit=Security events
 InfoDolibarr=За Dolibarr
 InfoBrowser=За браузъра
 InfoOS=За операционната система
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Списък на събитията Dolibarr сигурност
 SecurityEventsPurged=Събития по сигурността прочиства
-LogEventDesc=Можете да разрешите тук сеч за събития Dolibarr сигурност. Администраторите могат да видите неговото съдържание чрез меню <b>&quot;Системни инструменти - Одит.</b> Внимание, тази функция може да се консумира голямо количество данни в база данни.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Параметрите за настройка могат да се задават само от <b> Администратори </b>.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Нетен единичната цена на даден продукт
 TotalPriceAfterRounding=Обща цена (нето / с ДДС / с ДДС) след закръгляване
 ParameterActiveForNextInputOnly=Параметър ефективно само за следващия вход
-NoEventOrNoAuditSetup=Няма да се иска никакво обезпечение събитие е записано още. Това може да бъде нормално, ако одитът не е разрешена във &quot;Setup - охрана - одит&quot;.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Вижте настройка Sendmail
 BackupDesc=За да направите пълно архивно копие на Dolibarr, трябва да:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Допълнителни атрибути (линии на 
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Списък на известията за потр
 ListOfNotificationsPerUserOrContact=Списък на известията по потребител * или по контакт **
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=П. код
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index fb39f172269..849d4330e3c 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Банка
-MenuBankCash=Bank | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuBankCash=Банка | Каса
+MenuVariousPayment=Разнородни плащания
+MenuNewVariousPayment=Ново разнородно плащане
 BankName=Име на банката
 FinancialAccount=Сметка
 BankAccount=Банкова сметка
 BankAccounts=Банкови сметки
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Показване на сметка
 AccountRef=Финансова сметка реф.
 AccountLabel=Финансова сметка етикет
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Сметка адрес
 BankAccountCountry=Профил страната
 BankAccountOwner=Името на собственика на сметката
 BankAccountOwnerAddress=Притежател на сметката адрес
-RIBControlError=Integrity проверка на ценностите се провали. Това означава, информация за номера на тази сметка не са пълни или грешно (проверете страна, номера и IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Създаване на сметка
 NewBankAccount=Нова сметка
 NewFinancialAccount=Нова финансова сметка
@@ -66,16 +66,17 @@ BankTransactionByCategories=Bank entries by categories
 BankTransactionForCategory=Bank entries for category <b>%s</b>
 RemoveFromRubrique=Премахване на връзката с категория
 RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+ListBankTransactions=Списък на банкови записи
 IdTransaction=Transaction ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+BankTransactions=Банкови записи
+BankTransaction=Банков запис
+ListTransactions=Списък записи
+ListTransactionsByCategory=Списък записи/категории
+TransactionsToConciliate=Записи за равнение
 Conciliable=Може да се примири
 Conciliate=Reconcile
 Conciliation=Помирение
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Включват затворени сметки
 OnlyOpenedAccount=Само открити сметки
@@ -88,7 +89,7 @@ StatusAccountOpened=Отворен
 StatusAccountClosed=Затворен
 AccountIdShort=Номер
 LineRecord=Транзакция
-AddBankRecord=Add entry
+AddBankRecord=Добави запис
 AddBankRecordLong=Add entry manually
 Conciliated=Reconciled
 ConciliatedBy=Съгласуват от
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Банков превод
 BankTransfers=Банкови преводи
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=От
 TransferTo=За
 TransferFromToDone=Прехвърлянето от <b>%s</b> на <b>%s</b> на %s <b>%s</b> беше записано.
@@ -114,14 +115,14 @@ ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Банката проверява
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Чекове чакащи депозит
 ShowCheckReceipt=Покажи проверете получаване депозит
-NumberOfCheques=Nb на чек
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+NumberOfCheques=No. of check
+DeleteTransaction=Изтри запис
+ConfirmDeleteTransaction=Сигурни ли сте че искате да изтриете този запис ? 
+ThisWillAlsoDeleteBankRecord=Това ще изтрие генерирания банков запис
 BankMovements=Движения
-PlannedTransactions=Planned entries
+PlannedTransactions=Планирани записи
 Graph=Графики
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
@@ -131,12 +132,12 @@ PaymentNumberUpdateFailed=Плащане брой не може да бъде а
 PaymentDateUpdateSucceeded=Payment date updated successfully
 PaymentDateUpdateFailed=Дата на плащане не може да бъде актуализиран
 Transactions=Сделки
-BankTransactionLine=Bank entry
+BankTransactionLine=Банков запис
 AllAccounts=All bank and cash accounts
 BackToAccount=Обратно към сметка
 ShowAllAccounts=Покажи за всички сметки
-FutureTransaction=Транзакция в FUTUR. Няма начин за помирение.
-SelectChequeTransactionAndGenerate=Изберете / филтрирате проверки, за да се включи в проверка за получаването на депозит и кликнете върху &quot;Създаване&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи
 ToConciliate=To reconcile?
@@ -144,22 +145,24 @@ ThenCheckLinesAndConciliate=След това проверете линии в 
 DefaultRIB=По подразбиране BAN
 AllRIB=Всички BAN
 LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
+NoBANRecord=Няма BAN запис
+DeleteARib=Изтри BAN запис
 ConfirmDeleteRib=Are you sure you want to delete this BAN record?
 RejectCheck=Върнат Чек
 ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
 RejectCheckDate=Дата на която чека е върнат
 CheckRejected=Върнат Чек
 CheckRejectedAndInvoicesReopened=Върнат Чек и отворена фактура
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
+BankAccountModelModule=Документ шаблон за банков акаунт
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Шаблон на който да се принтира страница с BAN информация
 NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
+VariousPayment=Разнородни плащания
+VariousPayments=Разнородни плащания
 ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index bb6f545a664..a748ccb01b1 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Клиентски фактури
 BillsCustomer=Продажна фактура
 BillsSuppliers=Фактури доставчици
 BillsCustomersUnpaid=Неплатени клиентски фактури
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Неплатени клиентски фактури за %s
 BillsSuppliersUnpaid=Неплатени фактури от доставчици
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Неплатени фактури на доставчици за %s
 BillsLate=Забавени плащания
 BillsStatistics=Статистика за продажни фактури
 BillsStatisticsSuppliers=Статистика за доставни фактури
@@ -17,18 +17,18 @@ DisabledBecauseNotErasable=Disabled because cannot be erased
 InvoiceStandard=Стандартна фактура
 InvoiceStandardAsk=Стандартна фактура
 InvoiceStandardDesc=Тази фактурата е фактура от най-общ вид.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
+InvoiceDeposit=Авансова фактура
+InvoiceDepositAsk=Авансова фактура
 InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
 InvoiceProForma=Проформа фактура
 InvoiceProFormaAsk=Проформа фактура
 InvoiceProFormaDesc=<b>Проформа фактура</b> е първообраз на една истинска фактура, но няма счетоводна стойност.
 InvoiceReplacement=Подменяща фактура
 InvoiceReplacementAsk=Фактура подменяща друга фактура
-InvoiceReplacementDesc=<b>Подменяща фактура</b> се използва, за да отмени и замени напълно фактура, по която няма плащане.<br> <br>Бележка: Само фактури без плащане могат да бъдат заменяни. Ако фактурата която се заменя, все още не е затворена, тя автоматично ще бъде затворена до 'изоставена'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Кредитно известие
 InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
-InvoiceAvoirDesc=<b>Кредитно известие</b> е отрицателна фактура, използвана за решаване на факта, че фактурата е със сума, която се различава от наистина платената сума (защото клиентът е платил твърде много по грешка, или няма да се изплати напълно, тъй като е върнал някои продукти, например).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Създаване на кредитно известие с редове от оригиналната фактура
 invoiceAvoirWithPaymentRestAmount=Създаване на кредитно известие с неплатения остатък от оригиналната фактура
 invoiceAvoirLineWithPaymentRestAmount=Кредитно известие с неплатен остатък
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Платено обратно
 DeletePayment=Изтрий плащане
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Плащания към доставчици
 ReceivedPayments=Получени плащания
 ReceivedCustomersPayments=Плащания получени от клиенти
-PayedSuppliersPayments=Плащания направени към доставчици
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Получени плащания от клиенти за валидация
 PaymentsReportsForYear=Отчети за плащания за %s
 PaymentsReports=Отчети за плащания
@@ -91,8 +91,8 @@ PaymentConditionsShort=Усл.за плащане
 PaymentAmount=Сума за плащане
 ValidatePayment=Валидирай плащане
 PaymentHigherThanReminderToPay=Плащането е по-високо от напомнянето за плащане
-HelpPaymentHigherThanReminderToPay=Внимание, сумата на плащане на една или повече сметки е по-висока, отколкото останала за плащане част. <br> Редактирайте, или потвърдете, но тогава мислете за създаване на кредитно известие от превишението по всяека надвнесена фактура.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Класифицирай 'Платено'
 ClassifyPaidPartially=Класифицирай 'Платено частично'
 ClassifyCanceled=Класифицирай 'Изоставено'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Затворена (неплатена)
 BillStatusClosedPaidPartially=Платена (частично)
 BillShortStatusDraft=Чернова
 BillShortStatusPaid=Платена
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Платена
 BillShortStatusCanceled=Изоставена
 BillShortStatusValidated=Валидирана
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Затворена
 BillShortStatusClosedPaidPartially=Платена (частично)
 PaymentStatusToValidShort=За валидиране
-ErrorVATIntraNotConfigured=Вътрешнообщностен номер по ДДС все още не е определен
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Няма дефиниран вид на плащане по подразбиране. Отидидете на модул за настройка на фактури за да се поправи това.
 ErrorCreateBankAccount=Създайте банкова сметка и след това направете настройките в модула за настройка на фактури
 ErrorBillNotFound=Фактура %s не съществува
-ErrorInvoiceAlreadyReplaced=Грешка, опитвате се да валидирате фактура, която да замени фактура %s. Но тя вече е заменена с фактура %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Грешка, вече се използва отстъпка
 ErrorInvoiceAvoirMustBeNegative=Грешка, коригиращата фактура трябва да има отрицателна сума
 ErrorInvoiceOfThisTypeMustBePositive=Грешка, този тип фактура трябва да има положителна стойност,
 ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да се анулира фактура, която е била заменена от друга фактура, която все още е в състояние на чернова
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане. Урегулирам ДДС с кредитно известие.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане. Приемам да се загуби ДДС по тази отстъпка.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Неплатеният остатък <b>(%s %s)</b> е дадена отстъпка, защото плащането е направено преди срока за плащане Възстановявам ДДС по тази отстъпка без кредитно известие.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Лош клиент
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично върнати
 ConfirmClassifyPaidPartiallyReasonOther=Сумата е изоставена по друга причина
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Този избор е възможно, ако към фактурата е направен подходящ коментар. (Пример: «Само данъка, съответстваща на цената, която действително е платената дава права на приспадане»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=В някои страни, този избор може да бъде възможен само ако фактурата съдържа правилна бележка.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Използвайте този избор, ако всички други не са подходящи
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Лош клиентът</b> е клиент, който отказва да изплати дълга си.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Този избор се използва, когато плащането не е пълно, тъй като някои от продуктите са били върнати
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Използвайте този избор, ако всички останали не са подходящи, например в следната ситуация:<br>- Непъло плащане, тъй като някои продукти са върнати<br> - Претендираната сума е твърде важна, защото е била забравена отстъпката<br> Във всички случаи, разликата в сумата трябва да бъде коригирана в счетоводната система чрез създаване на кредитно известие.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Друг
 ConfirmClassifyAbandonReasonOtherDesc=Този избор ще бъде използван във всички останали случаи. За пример, защото имате намерение да създадете заменяща фактура.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,16 +201,17 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Валидирай фактура
 UnvalidateBill=Отвалидирай фактура
-NumberOfBills=Бр. фактури
-NumberOfBillsByMonth=Бр фактури по месец
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Сума на фактури
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Сума на фактури по месец (без данък)
 ShowSocialContribution=Покажи социален/фискален данък
 ShowBill=Покажи фактура
 ShowInvoice=Покажи фактура
 ShowInvoiceReplace=Покажи заменяща фактура
 ShowInvoiceAvoir=Покажи кредитно известие
-ShowInvoiceDeposit=Show down payment invoice
+ShowInvoiceDeposit=Покажи авансова фактура
 ShowInvoiceSituation=Show situation invoice
 ShowPayment=Покажи плащане
 AlreadyPaid=Вече е платена
@@ -260,9 +262,9 @@ Repeatables=Шаблони
 ChangeIntoRepeatableInvoice=Превърни в шаблон за фактура
 CreateRepeatableInvoice=Създай шаблон за фактура
 CreateFromRepeatableInvoice=Създай от шаблон за фактура
-CustomersInvoicesAndInvoiceLines=Продажни фактури и фактурни редове
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Продажни фактури и плащания
-ExportDataset_invoice_1=Списък с продажни фактури и фактурни редове
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Продажни фактури и плащания
 ProformaBill=Проформа фактура:
 Reduction=Намаляване
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Фактурен адрес
-HelpEscompte=Тази отстъпка е предоставена на клиента, тъй като плащането е извършено преди срока.
-HelpAbandonBadCustomer=Тази сума е изоставена (клиентът се оказва лош клиент) и се счита като извънредна загуба.
-HelpAbandonOther=Тази сума е изоставена, тъй като тя е грешка (грешен клиент или фактура, заменен от друг например)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Id за плащане на социален/фискален данък
 PaymentId=Плащане ID
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Не е избрана фактура
 CloneInvoice=Клонирай фактура
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Действието е деактивирано, тъй като фактурата е била заменена
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Бр. на плащанията
+DescTaxAndDividendsArea=Тази секция представлява обобщение на всички плащания, извършени за специални разходи. Включват се само записи с плащане през фиксираната година.
+NbOfPayments=No. of payments
 SplitDiscount=Раздели отстъпката на две
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Размер за всяка от двете части:
-TotalOfTwoDiscountMustEqualsOriginal=Сумата на двете нови отстъпки трябва да е равен на оригиналната сума на отстъпка.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Свързана фактура
 RelatedBills=Свързани фактури
 RelatedCustomerInvoices=Свързани продажни фактури
 RelatedSupplierInvoices=Свързани доставни фактури
 LatestRelatedBill=Последна свързана фактура
-WarningBillExist=Внимание, една или повече актури вече съществуват
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Инструмент за sliwane на PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Чек
 PaymentTypeShortCHQ=Чек
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Плащане онлайн
-PaymentTypeShortVAD=Онлайн
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Чернова
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Банкови данни
 BankCode=Банков код
-DeskCode=Касов код
+DeskCode=Office code
 BankAccountNumber=Номер на сметка
-BankAccountNumberKey=Ключ
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN номер
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT код
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Плащане чрез банков прев
 VATIsNotUsedForInvoice=* Неприложим ДДС, art-293BB от CGI
 LawApplicationPart1=Чрез прилагането на закон 80.335 от 12/05/80
 LawApplicationPart2=стоките остават собственост на
-LawApplicationPart3=продавача до пълното изплащане на
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=цената им.
 LimitedLiabilityCompanyCapital=SARL със столица
 UseLine=Приложи
@@ -463,7 +465,7 @@ Cheques=Чекове
 DepositId=Id депозит
 NbCheque=Брой чекове
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Използвай адрес за фактуриране на клиента, вместо адреса на контрагента като получател за фактури
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Покажи всички неплатени фактури
 ShowUnpaidLateOnly=Покажи само неплатените фактури с просрочено плащане
 PaymentInvoiceRef=Платежна фактуре %s
@@ -474,21 +476,22 @@ Reported=Закъснение
 DisabledBecausePayments=Не е възможно, тъй като има някои плащания
 CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирана като платена
 ExpectedToPay=Очаквано плащане
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Плаща от това плащане
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Класифицирай "Платени" всички кредитни известия изцяло обратно платени.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Всички фактура без остатък за плащане, ще бъдат затворени автоматично със статус "Платени".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Плати
 ToMakePaymentBack=Плати обратно
 ListOfYourUnpaidInvoices=Списък с неплатени фактури
 NoteListOfYourUnpaidInvoices=Бележка: Този списък съдържа само фактури за контрагенти, които са свързани като търговски представители.
 RevenueStamp=Приходен печат
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Фактурен PDF шаблон. Пълен шаблон за фактура (препоръчителен шаблон)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Върнете номер с формат %syymm-nnnn за стандартни фактури и %syymm-nnnn за кредитни известия, където уу е година, mm е месец и NNNN е последователност, без прекъсване и без 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index 6360f3557ed..9f64ef2d75a 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Покажи фирмата
 ShowStock=Покажи склад
 DeleteArticle=Кликнете, за да се премахне тази статия
 FilterRefOrLabelOrBC=Търсене (Номер/Заглавие)
-UserNeedPermissionToEditStockToUsePos=Запитвате за намаляване на стоки при създаване на фактура, така че потребителя използващ ТП трябва да е с привилегии да редактира стоки.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr принтер за квитанции
+PointOfSale=Точка на продажбите
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang
index a84beabe02f..6dae3cae02c 100644
--- a/htdocs/langs/bg_BG/commercial.lang
+++ b/htdocs/langs/bg_BG/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Телефонно обаждане
 ActionAC_FAX=Изпращане на факс
 ActionAC_PROP=Изпрати предложение по пощата
 ActionAC_EMAIL=Изпращане на имейл
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Срещи
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Изпращане на клиента фактура по пощата
@@ -72,8 +73,8 @@ StatusProsp=Prospect статус
 DraftPropals=Проектът на търговски предложения
 NoLimit=Няма лимит
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bg_BG/dict.lang b/htdocs/langs/bg_BG/dict.lang
index 366391943a4..b68c6f9793d 100644
--- a/htdocs/langs/bg_BG/dict.lang
+++ b/htdocs/langs/bg_BG/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Хърд и Макдоналд
 CountryVA=Светия престол (Ватикана)
 CountryHN=Хондурас
 CountryHK=Хонконг
-CountryIS=Исландия
+CountryIS=Iceland
 CountryIN=Индия
 CountryID=Индонезия
 CountryIR=Иран
@@ -131,7 +131,7 @@ CountryKI=Кирибати
 CountryKP=Северна Корея
 CountryKR=Южна Корея
 CountryKW=Кувейт
-CountryKG=Киргизтан
+CountryKG=Kyrgyzstan
 CountryLA=Лао
 CountryLV=Латвия
 CountryLB=Ливан
@@ -160,7 +160,7 @@ CountryMD=Молдова
 CountryMN=Монголия
 CountryMS=Monserrat
 CountryMZ=Мозамбик
-CountryMM=Birmania (Мианмар)
+CountryMM=Myanmar (Burma)
 CountryNA=Намибия
 CountryNR=Науру
 CountryNP=Непал
@@ -223,7 +223,7 @@ CountryTO=Лека индийска двуколка
 CountryTT=Тринидад и Тобаго
 CountryTR=Турция
 CountryTM=Туркменистан
-CountryTC=Турците и Cailos острови
+CountryTC=Turks and Caicos Islands
 CountryTV=Тувалу
 CountryUG=Уганда
 CountryUA=Украйна
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Мавриций рупии
 CurrencySingMUR=Мавриций рупии
 CurrencyNOK=Норвежките Кронес
-CurrencySingNOK=Норвежка крона
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Тунизийски динара
 CurrencySingTND=Тунизийски динар
 CurrencyUSD=Щатски долари
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Уста на уста
 DemandReasonTypeSRC_PARTNER=Партньор
 DemandReasonTypeSRC_EMPLOYEE=Служител
 DemandReasonTypeSRC_SPONSORING=Спонсорство
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Формат 4A0
 PaperFormatEU2A0=Формат 2A0
diff --git a/htdocs/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
index d3101db381e..20b6c024577 100644
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Брой на документите в директорията
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Директория
 ECMSectionManual=Ръчно създадена директория
 ECMSectionAuto=Автоматично създадена директория
@@ -34,6 +34,8 @@ ECMDocsByProjects=Документи свързани към проекти
 ECMDocsByUsers=Документи свързани към потребители
 ECMDocsByInterventions=Документи свързани към интервенции
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Не е създадена директория
 ShowECMSection=Покажи директория
 DeleteSection=Изтриване на директория
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 2c766d84098..5c41ef094bf 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP клиента се повреди с греш
 ErrorGlobalVariableUpdater5=Няма избрана глобална променлива
 ErrorFieldMustBeANumeric=Поле <b>%s</b> трябва да бъде числена стойност
 ErrorMandatoryParametersNotProvided=Задължителен параметър(и) не е даден
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
diff --git a/htdocs/langs/bg_BG/help.lang b/htdocs/langs/bg_BG/help.lang
index 23b57d1df7d..ef4733a4662 100644
--- a/htdocs/langs/bg_BG/help.lang
+++ b/htdocs/langs/bg_BG/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Онлайн в реално време / дистанци
 OtherSupport=Друга поддръжка
 ToSeeListOfAvailableRessources=За да се свържете/вижте наличните ресурси:
 HelpCenter=Помощен център
-DolibarrHelpCenter=Dolibarr център за помощ и поддръжка
-ToGoBackToDolibarr=В противен случай, щракнете <a href="%s">тук, за да използвате Dolibarr</a>
-TypeOfSupport=Източник на подкрепа
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Общност (безплатно)
 TypeSupportCommercial=Търговски
 TypeOfHelp=Тип
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Ефективност
 TypeHelpOnly=Само помощ
 TypeHelpDev=Помощ + развитие
-TypeHelpDevForm=Помощ + развитие + Формиране
-ToGetHelpGoOnSparkAngels1=Някои компании могат да осигурят бързо (по някое време незабавно) и по-ефективни онлайн поддръжка чрез поемането на контрола на вашия компютър. Такива помощници може да се намери на уеб сайта на <b>%s:</b>
-ToGetHelpGoOnSparkAngels3=Можете също да отидете към списъка на всички налични треньори за Dolibarr за тази цел кликнете върху бутона
-ToGetHelpGoOnSparkAngels2=Понякога, няма фирма, на разположение в момента, в който търсенето си, така че мислете за промяна на филтъра, за да търсят &quot;всичко наличност&quot;. Вие ще бъдете в състояние да изпрати повече заявки.
-BackToHelpCenter=В противен случай, натиснете тук, за да отиде <a href="%s">да помогне на центъра начална страница</a> .
-LinkToGoldMember=Можете да се обадите на треньора, предварително подбрани от Dolibarr за вашия език (%s), като щракнете върху му Widget (статус и максимална цена се актуализира автоматично):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Поддържани езици
-SubscribeToFoundation=Помогнете на проекта Dolibarr, като се присъедините към фондацията
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=За официална поддръжка на Dolibarr за Вашият език: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index 8ecb7b74d40..988781d62a8 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=ЧР
-Holidays=Отпуски
-CPTitreMenu=Отпуски
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Месечно извлечение
 MenuAddCP=Нова молба за отпуск
-NotActiveModCP=Трябва да активирате модула за отпуски, за да видите тази страница.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Кандидатстване за отпуск
 DateDebCP=Начална дата
 DateFinCP=Крайна дата
@@ -15,13 +15,18 @@ ApprovedCP=Утвърден
 CancelCP=Отменен
 RefuseCP=Отказ
 ValidatorCP=Утвърждаващ
-ListeCP=Списък на отпуски
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Ще бъде утвърден от
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Описание
 SendRequestCP=Създаване на молба за отпуск
 DelayToRequestCP=Молбите за отпуски трябва да бъдат направени най-малко <b>%s ден(а)</b> преди началната им дата.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Баланса на отпуските е <b>%s</b> дни.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Трябва да изберете крайната дата, по-голяма от началната дата.
 ErrorSQLCreateCP=Възникна SQL грешка по време на създаването:
 ErrorIDFicheCP=Възникна грешка, молбата за отпуск не съществува.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Не сте упълномощени да четете тази
 InfosWorkflowCP=Информация Workflow
 RequestByCP=По искане на
 TitreRequestCP=Молба за отпуск
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Брой на дните на използваните отпуски
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Редактиране
 DeleteCP=Изтриване
 ActionRefuseCP=Отказване
@@ -59,6 +71,7 @@ DateRefusCP=Дата на отказ
 DateCancelCP=Дата на анулирането
 DefineEventUserCP=Присвояване изключително отпуск за потребителя
 addEventToUserCP=Присвояване напусне
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Причина
 UserCP=Потребител
 ErrorAddEventToUserCP=Възникна грешка при добавяне на изключително отпуск.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Актуализира се успешно.
 Module27130Name= Управление на молби за отпуск
 Module27130Desc= Управление на молби за отпуск
@@ -94,7 +112,7 @@ NoticePeriod=Период на известяване
 HolidaysToValidate=Валидиране на молби за отпуск
 HolidaysToValidateBody=Отдолу е молба за отпуск за валидиране
 HolidaysToValidateDelay=Тази молба за отпуск ще се случи в период от по-малко от %s дни.
-HolidaysToValidateAlertSolde=Потребителя, който е направил тази молба за отпуск няма достатъчно налични дни.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Валидирани молби за отпуск
 HolidaysValidatedBody=Вашата молба за отпуск от %s до %s е била валидирана.
 HolidaysRefused=Молбата отказана
@@ -103,4 +121,9 @@ HolidaysCanceled=Отказани молби за отпуск
 HolidaysCanceledBody=Вашата молба за отпуск от %s до %s е била отказана.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Отидете на <strong>Начало - Настройки - Речници - Тип на отпуски</strong> за настройка на различните типове на отпуски.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 3489238388e..29c2e8fa5b6 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Просто следвайте инструкциите стъпка по стъпка.
 MiscellaneousChecks=Предпоставки проверка
 ConfFileExists=Конфигурационния файл <b>%s</b> съществува.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Конфигурационния файл <b>%s</b> не съществува и не може да бъде създаден!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Конфигурационния файл <b>%s</b> може да бъде създаден.
-ConfFileIsNotWritable=<b>%s</b> конфигурационен файл е без права за запис. Проверете правата. При първа инсталация, вашия уеб сървър трябва да бъде настроен с права за запис в този файл по време на процеса на конфигуриране (&quot;chmod 666&quot; за пример на Unix подобна операционна система).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Конфигурационния файл <b>%s</b> е с права за писане.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Презареждане на цялата информация от конфигурационния файл.
+ConfFileMustBeAFileNotADir=Конфигурационният файл <b> %s </b> трябва да бъде файл, а не директория.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
-PHPSupportPOSTGETKo=Възможно е PHP настройките Ви да не поддържат променливи POST и / или GET. Проверете параметър <b>variables_order</b> в php.ini.
-PHPSupportGD=PHP поддържа GD графични функции.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=PHP поддържа UTF8 функции.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=PHP макс сесия памет е <b>%s.</b> Това трябва да бъде достатъчно.
-PHPMemoryTooLow=PHP макс сесия памет е настроен на <b>%s</b> байта. Това може да бъде прекалено ниско. Променете <b>php.ini</b> като настроите параметър <b>memory_limit</b> най-малко <b>%s</b> байта.
-Recheck=Кликнете тук за по-значим тест
-ErrorPHPDoesNotSupportSessions=Вашата PHP инсталация не поддържа сесии. Тази функция е нужна за правилата работа на Dolibarr. Проверете PHP настройките.
-ErrorPHPDoesNotSupportGD=Вашата PHP инсталация не поддържа графична функция GD. Графиките няма да бъдат достъпни.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Вашата PHP инсталация не поддържа UTF8 функции. Dolibarr не може да работи правилно. Преконфигурирайте преди да инсталирате Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Директорията %s не съществува.
-ErrorGoBackAndCorrectParameters=Върни се назад и коригирайте грешните параметри.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Може да сте въвели грешна стойност за параметър '%s'.
 ErrorFailedToCreateDatabase=Неуспешно създаване на базата данни '%s'.
 ErrorFailedToConnectToDatabase=Неуспешна връзка с база данни '%s'.
 ErrorDatabaseVersionTooLow=Версията на базата данни (%s) е твърде стара. Изисква се версия %s или по-нова.
 ErrorPHPVersionTooLow=Версията на PHP е твърде стара. Изисква се версия %s.
-ErrorConnectedButDatabaseNotFound=Свързването към сървъра е успешено, но базата данни '%s' не е открита.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Базата данни %s вече съществува.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ако базата данни не съществува, върнете се назад и проверете опцията "Създаване на база данни".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ако базата данни вече съществува, върнете се обратно и махнете отметката на "Създаване на база данни".
-WarningBrowserTooOld=Твърде стара версия на браузъра. Надстройването на браузъра ви до последната версия на Firefox, Chrome или Opera е силно препоръчително.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Версия на PHP
 License=Лиценз за използване
 ConfigurationFile=Конфигурационен файл
@@ -45,22 +45,23 @@ DolibarrDatabase=База данни на Dolibarr
 DatabaseType=Тип на базата данни
 DriverType=Тип драйвер
 Server=Сървър
-ServerAddressDescription=Име или IP адрес на сървъра на базата данни, обикновено 'localhost', когато сървъра на базата данни се хоства на същия сървър като уеб сървъра
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Порт на сървъра на базата данни. Оставете празно ако е неизвестно.
 DatabaseServer=Сървър на базата данни
 DatabaseName=Име на базата данни
-DatabasePrefix=Префикс на таблиците
-AdminLogin=Идентифициране на собственика на базата данни на Dolibarr.
-PasswordAgain=Въведете паролата отново
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Парола на собственика на базата данни на Dolibarr.
 CreateDatabase=Създаване на база данни
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Сървър на базата данни - Достъп супер потребител
-CheckToCreateDatabase=Отметнете ако базата данни не съществува и трябва да бъде създадена. <br> В този случай, трябва да попълните потребителско име/парола за профил на суперпотребител в долната част на тази страница.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Идентифицирането на потребителя му позволява да създава нови бази данни или нови потребители, задължително ако вашата база данни или нейния собственик вече не съществуват.
-KeepEmptyIfNoPassword=Оставете празно, ако потребителят няма парола (избягвайте това)
-SaveConfigurationFile=Регистрация на конфигурационния файл
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Свързване със сървъра
 DatabaseCreation=Създаване на база данни
 CreateDatabaseObjects=Създаване на обекти в базата данни
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Създаване на чужди ключове и и
 OtherKeysCreation=Създаване на чужди ключове и индекси
 FunctionsCreation=Създаване на функции
 AdminAccountCreation=Създаване на администраторски профил
-PleaseTypePassword=Моля, въведете парола, празни пароли не са позволени!
-PleaseTypeALogin=Моля, въведете име!
-PasswordsMismatch=Паролите не съвпадат, опитайте отново!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Край на настройкате
 SystemIsInstalled=Инсталирането завърши.
 SystemIsUpgraded=Dolibarr е обновен успешно.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Трябва да конфигурирате Dolibarr
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Отиди на Dolibarr
 GoToSetupArea=Отиди на Dolibarr (област за настройка)
-MigrationNotFinished=Версията на вашата база данни не е напълно актуална, така че ще трябва отново да стартирате процеса на надграждане.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Отидете отново на страницата за надграждане
 WithNoSlashAtTheEnd=Без наклонена черта "/" в края
-DirectoryRecommendation=Препоръчва се да използвате директория извън директорията на своите уеб страници.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Вече съществува
 DolibarrAdminLogin=Администраторски вход в Dolibarr
-AdminLoginAlreadyExists=Администраторския профил за Dolibarr '<b>%s</b>' вече съществува. Върнете се назад, ако искате да създадете друг.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Внимание, от съображения за сигурност, след като ведъж инсталирането или надграждането завърши, за да се избегне ново използване на инструментите за инсталиране, трябва да добавите файл наречен <b>install.lock</b> в директорията с документи на Dolibarr, за да се избегне злонамерена употреба.
-FunctionNotAvailableInThisPHP=Не е наличено за това PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Изберете скрипт за миграция
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Скрипта обработва
 ChooseYourSetupMode=Изберете режим на настройка и кликнете върху "Начало"...
 FreshInstall=Нова инсталация
-FreshInstallDesc=Използвайте този режим, ако това е вашето първо инсталиране. Ако това не е така, този режим може да поправи непълна предишна инсталация, но ако искате да надградите вашата версия, изберете режим "Надграждане".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Надграждане
 UpgradeDesc=Използвайте този режим, ако желаете да замените старите файлове на Dolibarr с файлове от по-нова версия. Това ще обнови вашата база данни и данни.
 Start=Начало
 InstallNotAllowed=Настройката не разрешена поради правата на файла <b>conf.php</b>
 YouMustCreateWithPermission=Трябва да създадете файл %s и да настроите права за запис в него от уеб сървъра по време на процеса на инсталиране.
-CorrectProblemAndReloadPage=Моля, коригирайте проблема и натиснете F5, за да презаредите страницата.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Вече мигрирахте
 DatabaseVersion=Версия на базата данни
 ServerVersion=Версия на сървъра на базата данни
 YouMustCreateItAndAllowServerToWrite=Трябва да създадете тази директория и да позволите на уеб сървъра да записва в нея.
 DBSortingCollation=Ред за сортиране на символи
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Искате да създадете база данни <b>%s</b>, но за това Dolibarr трябва да се свърже със сървъра <b>%s</b> чрез супер потребителя <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Искате да създадете вход за база данни <b>%s</b>, но за това Dolibarr трябва да се свърже със сървъра <b>%s</b> чрез супер потребителя <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=Тъй като свързването е неуспешно, хоста или параметрите на супер потребителя трябва да са грешни.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans плащане е открито по метода %s
 RemoveItManuallyAndPressF5ToContinue=Премахнете го ръчно и натиснете F5, за да продължите.
 FieldRenamed=Полето е преименувано
-IfLoginDoesNotExistsCheckCreateUser=Ако все още не съществува вписване, трябва да проверите опцията "Създаване на потребител"
-ErrorConnection=Сървър "<b>%s</b>", име на база данни "<b>%s</b>", потребител "<b>%s</b>", или парола на базата данни може да са грешни или версията на PHP клиента може да е твърде стара, сравнена с версията на базата данни.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Препоръчителен избор е да инсталирате версия <b>%s</b> от вашата текуща версия <b>%s</b>
 InstallChoiceSuggested=<b>Избор за инсталиране, предложен от инсталатора</b>.
-MigrateIsDoneStepByStep=Целевата версия (%s) има празнина от няколко версии, така че помощника ще препоръча следваща миграция, след като тази завърши.
-CheckThatDatabasenameIsCorrect=Уверете се, че името на базата данни "<b>%s</b>" е правилно.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Ако това име е вярно и тази база данни все още не съществува, трябва да проверите опцията "Създаване на база данни".
 OpenBaseDir=Параметър PHP openbasedir
-YouAskToCreateDatabaseSoRootRequired=Отметнахте "Създаване на база данни". За тази цел, трябва да въведете потребителско име/парола на супер потребител (най-долу на формата).
-YouAskToCreateDatabaseUserSoRootRequired=Отметнахте "Създаване на собственик на базата данни". За тази цел, трябва да въведете потребителско име/парола на супер потребител (най-долу на формата).
-NextStepMightLastALongTime=Текущата стъпка може да продължи няколко минути. Моля, изчакайте докато следващия екран се покаже напълно, преди да продължите.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Мигриране на хранилище за пратки на поръчки от клиенти
 MigrationShippingDelivery=Надграждане на хранилище на доставки
 MigrationShippingDelivery2=Надграждане на хранилище на доставки 2
 MigrationFinished=Миграцията завърши
-LastStepDesc=<strong>Последна стъпка</strong>: Определете тук потребителско име и парола, които планирате да използвате, за да се свързвате със софтуера. Не ги губете, тъй като това е профил за администриране на всички останали.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Активиране на модул %s
 ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Вашата база данни е с версия %s. Тя има критичен бъг, причинявайки загуба на информация ако направите структурна промяна на вашата база данни, а подобна е задължителна при миграционния процес. Поради тази причина, миграцията не е позволена, докато не обновите вашата база данни до по-нова коригирана версия (списък на познати версии с бъгове: %s)
-KeepDefaultValuesWamp=Вие използвате помощника за настройка на Dolibarr от DoliWamp, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
-KeepDefaultValuesDeb=Вие използвате помощника за настройка на Dolibarr от пакет за Linux (Ubuntu, Debian, Fedora ...), така че стойностите, предложени тук вече са оптимизирани. Само създаването на парола на собственика на базата данни трябва да бъде завършена. Променяйте други параметри, само ако знаете какво правите.
-KeepDefaultValuesMamp=Вие използвате помощника за настройка на Dolibarr от DoliMamp, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
-KeepDefaultValuesProxmox=Вие използвате помощника за настройка на Dolibarr от Proxmox виртуална машина, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Миграция на данни за оферти
 MigrationInvoice=Миграция на данни за фактури за клиенти
 MigrationContract=Миграция на данни за договори
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Надграждането е успешно
 MigrationUpdateFailed=Неуспешен процес на надграждане
 MigrationRelationshipTables=Миграция на данни за свързани таблици (%s)
 MigrationPaymentsUpdate=Корекция на данни за плащане
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Корекция на данни в договор
 MigrationContractsNumberToUpdate=%s договор(и) за актуализиране
 MigrationContractsLineCreation=Създаване на ред в договор с реф. %s
 MigrationContractsNothingToUpdate=Няма повече задачи
-MigrationContractsFieldDontExist=Полето fk_facture вече не съществува. Нищо не може да се направи.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Корекция на празна дата в договор
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Няма празна дата на договор за коригиране
 MigrationContractsEmptyCreationDatesNothingToUpdate=Няма дата за създаване на договор за коригиране
 MigrationContractsInvalidDatesUpdate=Корекция на неправилни дати на договор
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Актуализация на доставката
 MigrationStockDetail=Актуализиране на наличната стойност на продукти
 MigrationMenusDetail=Актуализиране на таблици за динамични менюта
 MigrationDeliveryAddress=Актуализиране на адрес за доставка на пратки,
-MigrationProjectTaskActors=Миграция на данни за таблицата llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Миграция на полето fk_user_resp на llx_projet llx_element_contact
 MigrationProjectTaskTime=Актуализация на времето, прекарано в секунда
 MigrationActioncommElement=Актуализиране на данните за действия
 MigrationPaymentMode=Миграция на данни за начин на плащане
 MigrationCategorieAssociation=Миграция на категории
-MigrationEvents=Миграция на събития за добавяне на собственик на събитие в таблицата за възлагане
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Презареждане на модула %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Показване на недостъпните опции
-HideNotAvailableOptions=Скриване на недостъпните опции
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 91e808cabfe..1d1a6a40a44 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Контакти за този контрагент
 ContactsAddressesForCompany=Контакти/адреси за този контрагент
 AddressesForCompany=Адреси за този контрагент
 ActionsOnCompany=Събития за този контрагент
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Събития за този член
 ActionsOnProduct=Events about this product
 NActionsLate=%s закъснели
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Уеб Сайт
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Уебсайтове
+WebSiteAccounts=Website accounts
 ExpenseReport=Доклад разходи
 ExpenseReports=Опис разходи
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index f663ddd9748..6558f3277a6 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Свързан обект
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Заглавие
 WEBSITE_DESCRIPTION=Описание
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/bg_BG/paybox.lang b/htdocs/langs/bg_BG/paybox.lang
index 1d45efca0a7..aca768e6325 100644
--- a/htdocs/langs/bg_BG/paybox.lang
+++ b/htdocs/langs/bg_BG/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Paybox модул за настройка
 PayBoxDesc=В този модул се предлагат страници, които да дават възможност за заплащане на <a href="http://www.paybox.com" target="_blank">Paybox</a> от клиентите. Това може да се използва за плащане или за плащане на даден обект Dolibarr (фактура, поръчка, ...)
 FollowingUrlAreAvailableToMakePayments=Следните интернет адреси са на разположение, за да предложи на клиента да направи плащане по Dolibarr обекти
 PaymentForm=Формуляра за плащане
-WelcomeOnPaymentPage=Добре дошли на нашия онлайн платежни услуги
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Този екран ви позволи да направите онлайн плащане на %s.
 ThisIsInformationOnPayment=Това е информация за плащане, за да се направи
 ToComplete=За да завършите
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL да предложи %s онлайн
 ToOfferALinkForOnlinePaymentOnContractLine=URL да предложи %s онлайн интерфейс ползвател на платежни за договор линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL да предложи %s онлайн интерфейс ползвател на платежни за безплатен сума
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL да предложи %s онлайн интерфейс ползвател на платежни за член абонамент
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Можете също да добавите URL параметър <b>и етикет = <i>стойност</i></b> на която и да е от тези URL (задължително само за безплатно плащане), за да добавите свой ​​собствен етикет за коментар на плащане.
-SetupPayBoxToHavePaymentCreatedAutomatically=Настройте Paybox с URL <b>%s</b> да има плащане създава автоматично, когато валидирани от Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Тази страница потвърждава, че плащането е било записано. Благодаря.
-YourPaymentHasNotBeenRecorded=Плащането не е записана и сделката е била анулирана. Благодаря.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Отчитат параметри
 UsageParameter=Употреба параметри
 InformationToFindParameters=Помощ &quot;, за да намерите информация за %s сметка
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 38d32d9cad7..65f4d11a10e 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -15,8 +15,8 @@ ValidateProp=Одобряване на търговско предложение
 AddProp=Създаване на предложение
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+LastPropals=Последни %s предложения
+LastModifiedProposals=Последни %s промени по предложения
 AllPropals=Всички предложения
 SearchAProposal=Търсене предложение
 NoProposal=No proposal
@@ -33,10 +33,10 @@ PropalStatusSigned=Подписано (нужди фактуриране)
 PropalStatusNotSigned=Не сте (затворен)
 PropalStatusBilled=Таксува
 PropalStatusDraftShort=Проект
-PropalStatusValidatedShort=Валидирано
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Затворен
 PropalStatusSignedShort=Подписан
-PropalStatusNotSignedShort=Не сте
+PropalStatusNotSignedShort=Не е подписано
 PropalStatusBilledShort=Таксува
 PropalsToClose=Търговски предложения, за да го затворите
 PropalsToBill=Подписани търговски предложения законопроект
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s не е намерена
 AddToDraftProposals=Добавяне към черновата на предложение
 NoDraftProposals=Няма чернови на предложения
 CopyPropalFrom=Създаване на търговско предложение копиране съществуващото предложение
-CreateEmptyPropal=Създаване на празен търговски vierge предложения или от списъка на продуктите / услугите
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default търговски продължителност предложение на валидност (в дни)
-UseCustomerContactAsPropalRecipientIfExist=Използвайте адрес за контакт на клиента, ако вместо на трета страна адрес като адрес предложение получателя
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone търговско предложение
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Контакт с клиентите сле
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Цялостен модел за предложение (logo. ..)
+DocModelCyanDescription=Цялостен модел за предложение (logo. ..)
 DefaultModelPropalCreate=Създаване на модел по подразбиране
 DefaultModelPropalToBill=Шаблон по подразбиране, когато се затваря бизнес предложение (да бъде фактурирано)
 DefaultModelPropalClosed=Шаблон по подразбиране, когато се затваря бизнес предложение (не осчетоводено)
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index ab283f62b5f..0c763410695 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Код
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Изтрийте уебсайт
-ConfirmDeleteWebsite=Сигурни ли сте, че искате да изтриете този уебсайт? Всички негови страници и съдържание ще бъдат премахнати.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGE_EXAMPLE=Уеб страница, която да се използва като пример
 WEBSITE_PAGENAME=Име на страницата
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Линк към външен CSS файл
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Редактирай CSS или HTML header
+EditCss=Edit website properties
 EditMenu=Редактирай
 EditMedias=Edit medias
-EditPageMeta=Редайтирай Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Добави страница/контейнер
-HomePage=Home Page
+HomePage=Начална страница
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Преглед на вашият уебсайт %s не е наличен. Първо трябва да добавите страница.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Страницата %s все още няма съдържание, или кеш файла .tpl.php е премахнат. Редактирайте съдържанието на страницата, за да отстраните проблема.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Страница/Контейнер '%s' на уебсайта %s е изтрит
 PageAdded=Страница/Контейнер '%s' добавен
@@ -36,8 +39,8 @@ ViewPageInNewTab=Покажи страницата в нов прозорец
 SetAsHomePage=Задай като основна страница
 RealURL=Релен URL
 ViewWebsiteInProduction=Покажи уеб сайта използвайки началното URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Чета
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 08508d4e6e8..8d6e8e39b04 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index f83b748598b..8403c827174 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only opened accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 0e8ade2cae5..7aaacf6834a 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/bn_BD/commercial.lang b/htdocs/langs/bn_BD/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/bn_BD/commercial.lang
+++ b/htdocs/langs/bn_BD/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bn_BD/dict.lang b/htdocs/langs/bn_BD/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/bn_BD/dict.lang
+++ b/htdocs/langs/bn_BD/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bn_BD/help.lang b/htdocs/langs/bn_BD/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/bn_BD/help.lang
+++ b/htdocs/langs/bn_BD/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 57493b1c00f..22d9ffdee11 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/bn_BD/paybox.lang b/htdocs/langs/bn_BD/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/bn_BD/paybox.lang
+++ b/htdocs/langs/bn_BD/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang
index 2a22384d1c5..281a95fc095 100644
--- a/htdocs/langs/bn_BD/propal.lang
+++ b/htdocs/langs/bn_BD/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index a0881a60946..e6aba58b947 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Korisnici i grupe
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Poslovno
 Module2Desc=Commercial management
 Module10Name=Računovodstvo
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Fakture
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dobavljači
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Uslovi plaćanja
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Dopunski atributi (treća stranka)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Dopunski atributi (član)
 ExtraFieldsMemberType=Dopunske atributa (tip član)
 ExtraFieldsCustomerInvoices=Dopunski atributi (fakture)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index f15fe0c444a..6a077eb3325 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -7,7 +7,7 @@ BankName=Naziv banke
 FinancialAccount=Račun
 BankAccount=Žiro račun
 BankAccounts=Žiro računi
-BankAccountsAndGateways=Bankovni računi | Portali
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Finansijski račun ref
 AccountLabel=Naziv za finansijski račun
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Adresa računa
 BankAccountCountry=Zemlja računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Provjera integriteta vrijednosti neuspješna. To znači da podaci za ovaj broj računa nisu tačni ili nepotpuni (provjerite državu, brojeve i IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi finansijski račun
@@ -76,6 +76,7 @@ TransactionsToConciliate=Transakcije za izmirivanje
 Conciliable=Može se izmiriti
 Conciliate=Izmiriti
 Conciliation=Podmirivanje
+SaveStatementOnly=Save statement only
 ReconciliationLate=Kašnjenje s izmirivanjem
 IncludeClosedAccount=Uključiti zatvorene račune
 OnlyOpenedAccount=Samo otvoreni računi
@@ -104,7 +105,7 @@ SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
 BankTransfer=Prenos između banaka
 BankTransfers=Prenosi između banaka
 MenuBankInternalTransfer=Interni transfer
-TransferDesc=Prebacivanje s jednog računa na drugi, Dolibarr zapisuje dva unosa (potražuje račun sa kojeg se prenosi i duguje ciljni račun. Isti iznos (osim predznaka), oznaka i datum će se koristiti za ovu transakciju)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od strane
 TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od č
 BankChecks=Bankovni ček
 BankChecksToReceipt=Čekovi koji čekaju na depozit
 ShowCheckReceipt=Prikaži priznanicu depozita čeka
-NumberOfCheques=Broj čeka
+NumberOfCheques=No. of check
 DeleteTransaction=Obriši unos
 ConfirmDeleteTransaction=Da li ste sigurni da želite obrisati ovaj unos?
 ThisWillAlsoDeleteBankRecord=Ovim će se također obrisati i generisana bankovna transakcija
@@ -135,8 +136,8 @@ BankTransactionLine=Bankovna transakcija
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
-FutureTransaction=Transakcija u budućnosti. Ne može se izmiriti.
-SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Izaberite izvod iz banke za izmirivanje. Koristite brojevne vrijednosti koje se mogu sortirati: YYYYMM ili YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
 ToConciliate=Za izmirenje?
@@ -153,7 +154,7 @@ RejectCheckDate=Datum vraćanja čeka
 CheckRejected=Ček vraćen
 CheckRejectedAndInvoicesReopened=Ček vraćen i fakture ponovno otvorene
 BankAccountModelModule=Šabloni dokumenata za bankovne račune
-DocumentModelSepaMandate=Šablon za SEPA mandat. Koristan je samo za evropske zemlje članice EU.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Šablon za štampanje stranice sa BAN podacima.
 NewVariousPayment=Novo ostalo plaćanje
 VariousPayment=Razna plaćanja
@@ -162,4 +163,6 @@ ShowVariousPayment=Pokaži ostala plaćanja
 AddVariousPayment=Dodaj ostala plaćanja
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Vaš SEPA mandat
-FindYourSEPAMandate=Ovo je vaš SEPA mandat za potvrđivanje vaše kompanije za izradu zahtjeva za direktno plaćanje vašoj banci. Vratite banci potpisan (skeniran potpisan dokument) ili ga pošaljite poštom
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index e81b65d16ee..688a74a442e 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Predračun
 InvoiceProFormaDesc=<b>Predračun</b> izgleda isto kao račun, ali nema računovodstvene vrijednosti.
 InvoiceReplacement=Zamjenska faktura
 InvoiceReplacementAsk=Zamjenska faktura za fakturu
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Knjižna obavijest
 InvoiceAvoirAsk=Knjižna obavijest za korekciju računa
-InvoiceAvoirDesc=<b>Knjižna obavijest</b> je negativni račun, koji se koristi za rješavanje činjenice da računa ima iznos različit od iznosa koji je zaista plaćen (jer je kupac platio greškom više, ili neće da plati ostatak jer je vratio neke robe naprimjer).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=u valuti faktura
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
-ConfirmConvertToReduc=Da li želite ovo %s pretvoriti u apsolutni popust ?<br>Iznos će biti spremljen među sve popuste i može se koristiti kao poput za trenutnu ili neke buduće fakture za ovog kupca.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Uplate dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Primljene uplate od kupaca za potvrditi
 PaymentsReportsForYear=Izvještaji o uplatama za %s
 PaymentsReports=Izvještaji o uplatama
@@ -91,8 +91,8 @@ PaymentConditionsShort=Uslovi plaćanja
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
-HelpPaymentHigherThanReminderToPay=Upozorenje, plaćanje iznosa jedne ili više faktura je veće od ostatka duga. <br> Izmijenite vaš unos, u suprotnom potvrdite i napravite knjižnu obavijest za višak primljen za svaku više plaćenu fakturu.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao 'Plaćeno'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 ClassifyCanceled=Označi kao 'Otkazano'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zaključeno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (djelimično)
 BillShortStatusDraft=Uzorak
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refundirano ili preplaćeno
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Otkazano
 BillShortStatusValidated=Potvrđeno
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Nije vraćeno
 BillShortStatusClosedUnpaid=Zaključeno
 BillShortStatusClosedPaidPartially=Plaćeno (djelimično)
 PaymentStatusToValidShort=Za potvrdu
-ErrorVATIntraNotConfigured=PDV broj nije definisan
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Nema definisanog načina plaćanja. Idite u postavke modula faktura da popravite ovo.
 ErrorCreateBankAccount=Napravite bankovni račun, zatim idite u panel postavki modula računa za definiranje načina plaćanja
 ErrorBillNotFound=Faktura %s ne postoji
-ErrorInvoiceAlreadyReplaced=Greška, pokušavate odobriti fakturu za zamjenu fakture %s. Ali je ona već zamijenjena fakturom %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Greška, popust se već koristi
 ErrorInvoiceAvoirMustBeNegative=Greška, na popravljenem računu mora biti negativni iznos
 ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tip fakture mora imati pozitivnu količinu
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne možete poništiti fakturu koju je zamijenila druga faktura a koja je još u statusu nacrta
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije potpuno plaćena. Koji su razlozi da zatvorite ovu fakturu?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelimično vraćeni
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako faktura sadrži odgovarajući komentar. (Primjer «Imate pravo na odbitak, samo ako je plaćen porez koji odgovara cijeni»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim državama je ovaj izbor moguć samo ako faktura sadrži ispravne bilješke
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristiti ovaj izbor samo ako nije drugi nije zadovoljavajući
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji je odbija platiti svoj dug.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada uplata nije završena zbog povrata nekih proizvoda
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristite ovaj izbor ako bilo koji drugi ne odgovara, naprimjer u sljedećoj situaciji:<br>- plaćanje nije izvršeno jer su neki proizvodi vraćeni<br>- iznos je bio reklamiran, jer nije obračunat popust<br>U svim slučajevima, iznos koji je reklamiran mora biti ispravljen u računovodstvenom sistemu kreiranjem knjižne obavijesti.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Ostalo
 ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor se koristi u svim drugih slučajevima. Naprimjer, zbog toga sto planiranje kreirati zamjensku fakturu.
 ConfirmCustomerPayment=Da li odobravate unos ovo plaćanja za <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Da li odobravate unos ovo plaćanja za <b>%s</b> %s?
 ConfirmValidatePayment=Da li ste sigurni da želite odobriti ovo plaćanje? Poslije toga neće biti moguće izmjene ovog plaćanja.
 ValidateBill=Potvrdi fakturu
 UnvalidateBill=Otkaži potvrdu fakture
-NumberOfBills=Broj faktura
-NumberOfBillsByMonth=Broj faktura po mjesecu
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Iznos faktura
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Iznos faktura po mjesecu (bez PDV-a)
 ShowSocialContribution=Pokaži doprinose i poreze
 ShowBill=Prikaži fakturu
@@ -260,9 +262,9 @@ Repeatables=Šabloni
 ChangeIntoRepeatableInvoice=Pretvori u šablonsku fakturu
 CreateRepeatableInvoice=Napravi šablonsku fakturu
 CreateFromRepeatableInvoice=Napravi od šablonske fakture
-CustomersInvoicesAndInvoiceLines=Fakture kupaca i tekstovi faktura
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Faktura kupaca i uplate
-ExportDataset_invoice_1=Lista faktura kupaca i tekstovi faktura
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Faktura kupaca i uplate
 ProformaBill=Predračun:
 Reduction=Snižavanje
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Adresa fakture
-HelpEscompte=Ovaj popust je odobren za kupca jer je isplata izvršena prije roka.
-HelpAbandonBadCustomer=Ovaj iznos je otkazan (kupac je loš kupac) i smatra se kao potencijalni gubitak.
-HelpAbandonOther=Ovaj iznos je otkazan jer je došlo do greške (naprimjer pogrešan kupac ili faktura zamijenjena sa nekom drugom)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID uplate
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nijedna faktura nije odabrana
 CloneInvoice=Kloniraj fakturu
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Akcija onemogućena jer faktura je zamijenjena
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Broj uplate
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Razdvoji popust na dva
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Unesi iznos za svaki od dva dijela:
-TotalOfTwoDiscountMustEqualsOriginal=Ukupno za dva nova popusta mora biti jednako iznosu originalnog popusta.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Povezane fakture dobavljača
 LatestRelatedBill=Posljednje povezane fakture
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
 PaymentTypeTIP=Akreditiv (Akreditivno pismo)
 PaymentTypeShortTIP=Plaćanje akreditivom
-PaymentTypeVAD=Elektronska uplata
-PaymentTypeShortVAD=Elektronska uplata
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Povlačenje banke
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Podaci o banki
 BankCode=Kod banke
-DeskCode=Kod blagajne
+DeskCode=Office code
 BankAccountNumber=Kod računa
-BankAccountNumberKey=Ključ
+BankAccountNumberKey=Check digits
 Residence=Nalog za plaćanje
-IBANNumber=IBAN broj
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT broj
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Plaćanje transferom na žiro računu
 VATIsNotUsedForInvoice=* Nije primjenjiv PDV art-293B CGI
 LawApplicationPart1=Primjenom zakon 80.335 of 12/05/80
 LawApplicationPart2=roba ostaju vlasništvo od 
-LawApplicationPart3=prodavač do potpunog unovčavanja
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=njihove vrijednosti.
 LimitedLiabilityCompanyCapital=d.o.o. s kapitalom
 UseLine=Primijeniti
@@ -463,7 +465,7 @@ Cheques=Čekovi
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=Ova %s je konvertirana u %s
-UsBillingContactAsIncoiveRecipientIfExist=Za pošiljanje računa uporabi naslov kontakta za račune pri kupcu namesto naslova partnerja
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Prikaži sve neplaćene fakture
 ShowUnpaidLateOnly=Prikaži samo zakašnjele neplaćene fakture
 PaymentInvoiceRef=Faktura za plaćanje %s
@@ -474,21 +476,22 @@ Reported=Odgođeno
 DisabledBecausePayments=Nije moguće jer ima nekoliko uplata
 CantRemovePaymentWithOneInvoicePaid=Ne može se obrisati uplata jer ima bar jedna faktura klasifikovana kao plaćena
 ExpectedToPay=Očekivano plaćanje
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plaćeno ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Sve fakture bez preostalog iznosa za uplatu će atuomatski biti zatvorene uz status "Plaćeno".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Platiti
 ToMakePaymentBack=Povrat uplate
 ListOfYourUnpaidInvoices=Lista neplaćenih faktura
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Carinski pečat
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora PDV opcije, popusti, pogoji plačila, logo, itd...)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF šablon Crevette za račune. Kompletan šablon za situiranje privremenih situacija
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna broj brez presledkov in večja od 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Red prethodno fakturisanog ne može biti veće ili jedn
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Obriši šablon fakture
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Faktura obrisana
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index ccba7f982f2..12d0f2f3c11 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Prikaži kompaniju
 ShowStock=Prikaži skladište
 DeleteArticle=Klikni da uklonis ovaj proizvod
 FilterRefOrLabelOrBC=Traži (Ref/Oznaku)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Prodajna mjesta
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang
index a48ed15e580..d2bc91d438d 100644
--- a/htdocs/langs/bs_BA/commercial.lang
+++ b/htdocs/langs/bs_BA/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Status mogućeg klijenta
 DraftPropals=Nacrti poslovnih prijedloga
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bs_BA/dict.lang b/htdocs/langs/bs_BA/dict.lang
index f894c39c279..01423e26514 100644
--- a/htdocs/langs/bs_BA/dict.lang
+++ b/htdocs/langs/bs_BA/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Čuo Island i McDonald
 CountryVA=Sveta Stolica (Vatikan State)
 CountryHN=Honduras
 CountryHK=Hongkong
-CountryIS=Island
+CountryIS=Iceland
 CountryIN=Indija
 CountryID=Indonezija
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Severna Koreja
 CountryKR=Južna Koreja
 CountryKW=Kuvajt
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Letonija
 CountryLB=Liban
@@ -160,7 +160,7 @@ CountryMD=Moldavija
 CountryMN=Mongolija
 CountryMS=Monserrat
 CountryMZ=Mozambik
-CountryMM=Birma (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibija
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad i Tobago
 CountryTR=Turska
 CountryTM=Turkmenistan
-CountryTC=Turci i Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauricijke rupije
 CurrencySingMUR=Mauricijska rupija
 CurrencyNOK=Norveške krune
-CurrencySingNOK=Norveška kruna
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuniski dinari
 CurrencySingTND=Tuniski dinar
 CurrencyUSD=Američki dolari
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Riječ usta
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
 DemandReasonTypeSRC_SPONSORING=Pokroviteljstvo
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index 5b40d9734ed..ae71bd9dbcc 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Broj dokumenata u direktoriju
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Direktorij
 ECMSectionManual=Ručni direktorij
 ECMSectionAuto=Automatski direktorij
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenti vezani za projekte
 ECMDocsByUsers=Dokumenti povezani s korisnicima
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nema kreiranih direktorija
 ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 514146984bb..6c7a2b80016 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bs_BA/help.lang b/htdocs/langs/bs_BA/help.lang
index 1534da0d604..66b83ac1a4a 100644
--- a/htdocs/langs/bs_BA/help.lang
+++ b/htdocs/langs/bs_BA/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online uživo / daljinska podrška
 OtherSupport=Druge podrške
 ToSeeListOfAvailableRessources=Za kontaktirati/vidjeti dosupne resurse:
 HelpCenter=Centar za pomoć
-DolibarrHelpCenter=Dolibarr pomoć u centri za podršku
-ToGoBackToDolibarr=U suprotnom, klikni <a href="%s">ovdje za korištenje Dolibarr</a>
-TypeOfSupport=Izvorna podrška
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Zajednica (besplatno)
 TypeSupportCommercial=Poslovno
 TypeOfHelp=Tip
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efikasnost
 TypeHelpOnly=Samo pomoć
 TypeHelpDev=Pomoć + razvoj
-TypeHelpDevForm=Pomoć + razvoj + formiranje
-ToGetHelpGoOnSparkAngels1=Neke kompanije mogu omogućiti brzu (nekada i trenutnu) i efikasniju online podršku tako što preuzmu kontrolu nad vašim računarom. Takvu pomoć možete naći na <b>%s</b> web sajtu:
-ToGetHelpGoOnSparkAngels3=Također možete otići na listu svih dostupnik trenera za Dolibarr, za ovo kliknite na dugme
-ToGetHelpGoOnSparkAngels2=Ponekad, nema dostupnih kompanija kada tražite, zato razmislite da promijenite filter da tražite "Sva dostupnost". Moći ćete poslati više zahtjeva.
-BackToHelpCenter=U suprotnom, kliknite ovdje <a href="%s">da idete nazad na centralnu početnu stranicu</a>.
-LinkToGoldMember=Možete pozvati jednog od unaprijed izabranih Dolibarr trenera za vas jezik (%s) klikom na Widget (statusi i maksimalne cijene su automatski ažurirani)
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Podržani jezici
-SubscribeToFoundation=Pomozite dolibar projekti, pretplatite se fondaciji
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Za oficijelnu Dolibarr podršku za vaš jezik: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index e5354131a69..c26603617a9 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Kadrovska služba
-Holidays=Odlasci
-CPTitreMenu=Odlasci
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Mjesečni izvještaj
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Datum početka
 DateFinCP=Datum završetka
@@ -15,13 +15,18 @@ ApprovedCP=Odobren
 CancelCP=Otkazan
 RefuseCP=Odbijen
 ValidatorCP=Osoba koja odobrava
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Datum završetka mora biti poslije datuma početka.
 ErrorSQLCreateCP=Desila se SQL greška prilikom kreiranja:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Workflow informacija
 RequestByCP=Zahtjev poslao
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Izmjena
 DeleteCP=Obrisati
 ActionRefuseCP=Odbij
@@ -59,6 +71,7 @@ DateRefusCP=Datum odbijanja
 DateCancelCP=Datum poništavanja
 DefineEventUserCP=Dodijeli izuzetno odsustvo za korisnika
 addEventToUserCP=Dodijeli odsustvo
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Razlog
 UserCP=Korisnik
 ErrorAddEventToUserCP=Došlo je do greške prilikom dodavanja izuzetnog odsustva.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Uspješno ažuriranje.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index 0671dc322e8..d10825f6669 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Pratite instrukcije korak po korak.
 MiscellaneousChecks=Provjera preduvjeta
 ConfFileExists=Konfiguracijska datoteka<b>%s</b> postoji.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> ne postoji i ne može biti napravljena !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se može napraviti.
-ConfFileIsNotWritable=Po konfiguracijskoj datoteci <b>%s</b> se ne može pisati. Provjerite dozvole. Za prvu instalaciju, vaš web server mora dopustiti pisanje u ovu datoteku tokom procesa konfiguracije ("chmod 666" naprimjer na OS poput Unixa).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Napuni sve informacije iz konfiguracijske datoteke.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Ovaj PHP podržava sesije.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
-PHPSupportPOSTGETKo=Moguće je da vaše PHP postavke ne podržavaju varijable POST i/ili GET. Provjerite vaš parametar <b>variables_order</b> u php.ini.
-PHPSupportGD=Ovaj PHP podržava GD grafičke funkcije.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Ovaj PHP podržava UTF8 funkcije.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
-PHPMemoryTooLow=Vaša maks. PHP memorija sesije postavljena je na <b>%s</b> bajta. To je isuviše malo. Promijenite vaš <b>php.ini</b> da parametar <b>memory_limit</b> ima najmanje <b>%s</b> bajta.
-Recheck=Kliknite ovdje za više značajan test
-ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podržava sesije. Ova osobina je neophodna da bi Dolibarr uopće radio. Provjerite vašu PHP instalaciju.
-ErrorPHPDoesNotSupportGD=Vaša PHP instalacija ne podržava grafičku funkciju GD. Neće biti dostupni grafikoni.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Direktorij %s ne postoji.
-ErrorGoBackAndCorrectParameters=Vratite se nazad i ispravite pogrešne parametre.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Ništa za čišćenje/brisanje
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Premještanje događaja da bi se dodao kontakt događaja u tabelu dodjeljivanja
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index edac6415690..4569aaff71b 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakti za ovaj subjekt
 ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekt
 AddressesForCompany=Adrese za ovaj subjekt
 ActionsOnCompany=Događaji o ovom subjektu
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Događaji o ovom članu
 ActionsOnProduct=Događaji o ovom proizvodu
 NActionsLate=%s kasne
@@ -847,9 +848,9 @@ ModuleBuilder=Kreator modula
 SetMultiCurrencyCode=Postavi valutu
 BulkActions=Masovne akcije
 ClickToShowHelp=Klikni za prikaz pomoći
-WebSite=Veb sajt
-WebSites=Veb sajtovi
-WebSiteAccounts=Računi veb sajta
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Izvještaj troškova
 ExpenseReports=Izvještaj o troškovima
 HR=LJR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Datoteka dijeljena preko linka
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventar
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index dca185c7231..329e6b0ab2c 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titula
 WEBSITE_DESCRIPTION=Opis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Linija za uvoz
diff --git a/htdocs/langs/bs_BA/paybox.lang b/htdocs/langs/bs_BA/paybox.lang
index 51b83fb3c23..a902d6c7c97 100644
--- a/htdocs/langs/bs_BA/paybox.lang
+++ b/htdocs/langs/bs_BA/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
index 9e2afa6e4ff..b71736f4358 100644
--- a/htdocs/langs/bs_BA/propal.lang
+++ b/htdocs/langs/bs_BA/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Fakturisano
 PropalStatusDraftShort=Nacrt
-PropalStatusValidatedShort=Potvrđeno
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zatvoreno
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Kreiraj poslovni prijedlog kopiranje postojećeg prijedloga
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index c1e886b1fbb..7c8d089e492 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Pročitaj
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Računi veb sajta
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index b195e0b0bda..c3d79af55e9 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Trobar mòduls/complements externs
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Utilitats multi-mòduls
 ModuleFamilyExperimental=Mòduls experimentals
 ModuleFamilyFinancial=Mòduls financers (Comptabilitat/tresoreria)
 ModuleFamilyECM=Gestió Electrònica de Documents (GED)
-ModuleFamilyPortal=Llocs web i altres aplicacions frontals
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfícies amb sistemes externs
 MenuHandlers=Gestors de menú
 MenuAdmin=Editor de menú
@@ -463,9 +463,9 @@ ClickToShowDescription=Clica per mostrar la descripció
 DependsOn=This module needs the module(s)
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>Per formulari per crear un nou Tercer, és <strong>%s</strong>,<br>Si voleu un valor per defecte només si la URL conté algun paràmetre, llavors podeu emprar <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Permet l'ús de valors predeterminats personalitzats
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Usuaris i grups
 Module0Desc=Gestió d'usuaris / empleats i grups
 Module1Name=Third Parties
-Module1Desc=Gestió d'empreses i contactes (clients, clients potencials...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Comercial
 Module2Desc=Gestió comercial
 Module10Name=Comptabilitat
@@ -501,7 +501,7 @@ Module23Desc=Realitza el seguiment del consum d'energies
 Module25Name=Comandes de clients
 Module25Desc=Gestió de comandes de clients
 Module30Name=Factures
-Module30Desc=Gestió de factures i abonaments de clients. Gestió factures de proveïdors
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Proveïdors
 Module40Desc=Gestió de proveïdors i compres (ordres de compra i factures)
 Module42Name=Registre de depuració
@@ -902,7 +902,7 @@ DictionaryVAT=Taxa d'IVA o Impost de vendes
 DictionaryRevenueStamp=Imports de segells fiscals
 DictionaryPaymentConditions=Condicions de pagament
 DictionaryPaymentModes=Modes de pagament
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Tipus de pàgines web / contenidors
 DictionaryEcotaxe=Barems CEcoParticipación (DEEE)
 DictionaryPaperFormat=Formats paper
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Els informes es basen en el total de les vendes
 LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció per aquest codi
 LabelOnDocuments=Etiqueta sobre documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=A final de mes
 CurrentNext=Actual/Següent
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Auditoria de la seguretat d'esdeveniments
-Audit=Auditoria
+Audit=Security events
 InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Sobre el Navegador
 InfoOS=Sobre S.O.
@@ -1065,7 +1066,7 @@ BrowserName=Nom del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
 SecurityEventsPurged=Esdeveniments de seguretat purgats
-LogEventDesc=Podeu habilitar el registre d'esdeveniments de seguretat Dolibarr aquí. Els administradors poden veure el seu contingut a través de menú <b>Eines del sistema->Auditoria</b>. Atenció, aquesta característica pot consumir una gran quantitat de dades a la base de dades.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts per <b>usuaris administradors</b>.
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Pas de rang d'arrodoniment (per països en què l'arrodon
 UnitPriceOfProduct=Preu unitari sense IVA d'un producte
 TotalPriceAfterRounding=Preu total després de l'arrodoniment
 ParameterActiveForNextInputOnly=Paràmetre efectiu només a partir de les properes sessions
-NoEventOrNoAuditSetup=No s'han registrat esdeveniments de seguretat. Això pot ser normal si l'auditoria no ha estat habilitat a la pàgina "configuració->seguretat->auditoria".
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Veure la configuració local de sendmail
 BackupDesc=Per realitzar una còpia de seguretat completa de Dolibarr, vostè ha de:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Atributs complementaris (línies de plantilles de factures)
 ExtraFieldsSupplierOrdersLines=Atributs complementaris (línies de comanda)
 ExtraFieldsSupplierInvoicesLines=Atributs complementaris (línies de factura)
 ExtraFieldsThirdParties=Atributs complementaris (tercers)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Atributs complementaris (soci)
 ExtraFieldsMemberType=Atributs complementaris (tipus de socis)
 ExtraFieldsCustomerInvoices=Atributs complementaris (factures)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Llista de notificacions per usuari*
 ListOfNotificationsPerUserOrContact=Llista de notificacions per usuari* o per contacte**
 ListOfFixedNotifications=Llistat de notificacions fixes
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Vagi a la pestanya "Notificacions" d'un contacte de tercers per afegir o eliminar notificacions per contactes/direccions
 Threshold=Valor mínim/llindar
 BackupDumpWizard=Asistent per crear una copia de seguretat de la base de dades
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Codi postal
 ##### Resource ####
 ResourceSetup=Configuració del mòdul Recurs
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 102d0c90bbb..67e20cea355 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -7,7 +7,7 @@ BankName=Nom del banc
 FinancialAccount=Compte
 BankAccount=Compte bancari
 BankAccounts=Comptes bancaris
-BankAccountsAndGateways=Comptes bancaris | Passarel·les
+BankAccountsAndGateways=Banc | Passarel·les
 ShowAccount=Mostrar el compte
 AccountRef=Ref. compte financer
 AccountLabel=Etiqueta compte financer
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Domiciliació de compte
 BankAccountCountry=País del compte
 BankAccountOwner=Nom del titular del compte
 BankAccountOwnerAddress=Direcció del titular del compte
-RIBControlError=El dígit de control indica que la informació d'aquest compte bancari és incompleta o incorrecta.
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Crear compte
 NewBankAccount=Nou compte
 NewFinancialAccount=Nou compte financer
@@ -76,6 +76,7 @@ TransactionsToConciliate=Registres a conciliar
 Conciliable=Conciliable
 Conciliate=Conciliar
 Conciliation=Conciliació
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliació tardana
 IncludeClosedAccount=Incloure comptes tancats
 OnlyOpenedAccount=Només comptes oberts
@@ -104,7 +105,7 @@ SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
 MenuBankInternalTransfer=Transferència interna
-TransferDesc=Traspassa d'un compte a un altre, Dolibarr generarà dos registres (dèbit en compte origen i crèdit en compte destí. Per aquesta transacció s'utilitzarà el mateix import (excepte el signe), l'etiqueta i la data).
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=De
 TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
 BankChecksToReceipt=Xecs en espera de l'ingrés
 ShowCheckReceipt=Mostra la remesa d'ingrés de xec
-NumberOfCheques=N º de xecs
+NumberOfCheques=No. of check
 DeleteTransaction=Eliminar registre
 ConfirmDeleteTransaction=Esteu segur de voler eliminar aquesta registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
@@ -135,8 +136,8 @@ BankTransactionLine=Registre bancari
 AllAccounts=Tots els comptes bancaris i en efectiu
 BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
-FutureTransaction=Transacció futura. No és possible conciliar.
-SelectChequeTransactionAndGenerate=Selecciona/filtra els xecs a incloure en la remesa de xecs a ingressar i fes clic a "Crea".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
 ToConciliate=A conciliar?
@@ -153,7 +154,7 @@ RejectCheckDate=Data de devolució del xec
 CheckRejected=Xec retornat
 CheckRejectedAndInvoicesReopened=Xec retornat i factures reobertes
 BankAccountModelModule=Plantilles de documents per comptes bancaris
-DocumentModelSepaMandate=Plantilla per a mandat SEPA. Vàlid només per a països europeus de la CEE.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN
 NewVariousPayment=Nou pagament varis
 VariousPayment=Pagaments varis
@@ -162,4 +163,6 @@ ShowVariousPayment=Mostra els pagaments varis
 AddVariousPayment=Afegir pagaments extres
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
-FindYourSEPAMandate=Aquest és la vostra ordre SEPA per autoritzar a la nostra empresa a realitzar un ordre de dèbit directe al vostre banc. Gràcies per retornar-la signada (escanejar el document signat) o envieu-lo per correu a
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index c999f9ec359..397fccfafcc 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Factura proforma
 InvoiceProFormaDesc=La <b>factura proforma</b> és la imatge d'una factura definitiva, però que no té cap valor comptable.
 InvoiceReplacement=Factura rectificativa
 InvoiceReplacementAsk=Factura rectificativa de la factura
-InvoiceReplacementDesc=La <b>factura rectificativa</b> serveix per a cancel·lar i per substituir una factura existent sobre la qual encara no hi ha pagaments.<br> <br>Nota: Només una factura sense cap pagament pot rectificar-se. Si aquesta última no està tancada, passarà automàticament al estat 'abandonada'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Abonament
 InvoiceAvoirAsk=Abonament per factura rectificativa
-InvoiceAvoirDesc=El <b>abonament</ b> és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Crear abonament amb les línies de la factura d'origen
 invoiceAvoirWithPaymentRestAmount=Crear abonament de la factura pendent de pagament
 invoiceAvoirLineWithPaymentRestAmount=Abonament per a la quantitat restant no pagada
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Voleu convertir aquest %s en un descompte absolut? <br> L'import es guardarà entre tots els descomptes i es podria utilitzar com a descompte per a una factura actual o futura per a aquest proveïdor.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
 ReceivedCustomersPayments=Cobraments rebuts de clients
-PayedSuppliersPayments=Pagaments pagats als proveïdors
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Cobraments rebuts de client pendents de validar
 PaymentsReportsForYear=Informes de pagaments de %s
 PaymentsReports=Informes de pagaments
@@ -91,8 +91,8 @@ PaymentConditionsShort=Condicions de pagament
 PaymentAmount=Import pagament
 ValidatePayment=Validar aquest pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
-HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
-HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior al de la resta a pagar. <br> Editeu la vostra entrada, en cas contrari confirmeu i penseu a crear una nota de crèdit de l'excés pagat per cada factura pagada.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classificar 'Pagat'
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
 ClassifyCanceled=Classificar 'Abandonat'
@@ -107,11 +107,11 @@ SearchACustomerInvoice=Cercar una factura a client
 SearchASupplierInvoice=Cercar una factura de proveïdor
 CancelBill=Anul·lar una factura
 SendRemindByMail=Envia recordatori per e-mail
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
+DoPayment=Afegir pagament
+DoPaymentBack=Afegir reemborsament
 ConvertToReduc=Marca com a crèdit disponible
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertExcessReceivedToReduc=Convertir l'excés rebut en el crèdit disponible
+ConvertExcessPaidToReduc=Convertir l'excés pagat en descompte disponible
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
@@ -120,7 +120,7 @@ BillStatus=Estat de la factura
 StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
 BillStatusPaid=Pagada
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusPaidBackOrConverted=Nota de crèdit reembossada o marcada com a crèdit disponible
 BillStatusConverted=Pagada (llesta per utilitzar-se en factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Tancada (pendent de pagament)
 BillStatusClosedPaidPartially=Pagada (parcialment)
 BillShortStatusDraft=Esborrany
 BillShortStatusPaid=Pagada
-BillShortStatusPaidBackOrConverted=Reemborsada o convertida
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Tractada
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=No reemborsat
 BillShortStatusClosedUnpaid=Tancada
 BillShortStatusClosedPaidPartially=Pagada
 PaymentStatusToValidShort=A validar
-ErrorVATIntraNotConfigured=NIF intracomunitari encara no configurat
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No s'ha definit la forma de pagament per defecte. Ves a la configuració del mòdul Factures per corregir-ho.
 ErrorCreateBankAccount=Crea un compte bancari i després ves al panell de configuració del mòdul Factures per definir les formes de pagament
 ErrorBillNotFound=Factura %s inexistent
-ErrorInvoiceAlreadyReplaced=Error, vol validar una factura que rectifica la factura %s. Però aquesta última ja està rectificada per la factura %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, el descompte ja s'està utilitzant
 ErrorInvoiceAvoirMustBeNegative=Error, una factura rectificativa ha de tenir un import negatiu
 ErrorInvoiceOfThisTypeMustBePositive=Error, una factura d'aquest tipus ha de tenir un import positiu
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·lar una factura que ha estat substituïda per una altra que es troba en l'estat 'esborrany'.
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Aquesta part o una altra ja s'utilitza, de manera que la sèrie de descompte no es pot treure.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Està segur de voler classificar la factura <b>%s</b> co
 ConfirmCancelBill=Està segur de voler anul·lar la factura <b>%s</b>?
 ConfirmCancelBillQuestion=Per quina raó vols classificar aquesta factura com 'abandonada'?
 ConfirmClassifyPaidPartially=Està segur de voler classificar la factura <b>%s</b> com pagada?
-ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada?
-ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Regularitzo l'IVA d'aquest descompte amb un abonament.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta elecció és possible si la seva factura es provingera de la menció adequada. (Exemple: "descompte net d'impostos")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Aquesta elecció és possible si la seva factura es provingera de la menció adequada. (Exemple: menció per la qual es defineix el descompte o de la classe "només l'impost que correspon al preu efectivament pagat causa dret a deducció")
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Aquesta elecció és l'elecció que s'ha de prendre si les altres no són aplicables
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>client morós </b> és un client que no vol regularitzar el seu deute.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Aquesta elecció és possible si el cas de pagament incomplet és arran d'una devolució de part dels productes
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilitza aquesta opció si totes les altres no et convenen, per exemple en la situació següent:<br>- pagament parcial ja que una partida de productes s'ha tornat<br>- la quantitat reclamada és massa important perquè s'ha oblidat un descompte<br>En tots els casos, la reclamació s'ha de regularitzar mitjançant un abonament.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Altres
 ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol altre cas. Per exemple arran de la intenció de crear una factura rectificativa.
 ConfirmCustomerPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmValidatePayment=Estàs segur que vols validar aquest pagament? No es poden fer canvis un cop el pagament s'ha validat.
 ValidateBill=Validar factura
 UnvalidateBill=Tornar factura a esborrany
-NumberOfBills=Nº de factures
-NumberOfBillsByMonth=Nº de factures per mes
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Import de les factures
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Import de les factures per mes (Sense IVA)
 ShowSocialContribution=Mostra els impostos varis
 ShowBill=Veure factura
@@ -260,9 +262,9 @@ Repeatables=Recurrents
 ChangeIntoRepeatableInvoice=Convertir en recurrent
 CreateRepeatableInvoice=Crear factura recurrent
 CreateFromRepeatableInvoice=Crear des de factura recurrent
-CustomersInvoicesAndInvoiceLines=Factures a clients i línies de factures
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Factures a clients i cobraments
-ExportDataset_invoice_1=Factures a clients i línies de factura
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Factures a clients i cobraments
 ProformaBill=Factura proforma:
 Reduction=Reducció
@@ -282,7 +284,7 @@ RelativeDiscount=Descompte relatiu
 GlobalDiscount=Descompte fixe
 CreditNote=Abonament
 CreditNotes=Abonaments
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Notes de crèdit o excés rebut
 Deposit=Bestreta
 Deposits=Bestretes
 DiscountFromCreditNote=Descompte resultant del abonament %s
@@ -297,14 +299,14 @@ DiscountType=Tipus de descompte
 NoteReason=Nota/Motiu
 ReasonDiscount=Motiu
 DiscountOfferedBy=Acordat per
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
+DiscountStillRemaining=Descomptes o crèdits disponibles
+DiscountAlreadyCounted=Descomptes o crèdits ja consumits
 CustomerDiscounts=Descomptes de clients
 SupplierDiscounts=Descomptes dels proveïdors
 BillAddress=Direcció de facturació
-HelpEscompte=Un <b>descompte</b> és un descompte acordat sobre una factura donada, a un client que va realitzar el seu pagament molt abans del venciment.
-HelpAbandonBadCustomer=Aquest import es va abandonar (client jutjat com morós) i es considera com una pèrdua excepcional.
-HelpAbandonOther=Aquest import es va abandonar ja que es tractava d'un error de facturació (mala introducció de dades, factura substituïda per una altra).
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Id. pagament d'impost varis
 PaymentId=ID pagament
 PaymentRef=Ref. pagament
@@ -321,31 +323,31 @@ InvoiceNotChecked=Cap factura pendent està seleccionada
 CloneInvoice=Clonar factura
 ConfirmCloneInvoice=Vols clonar aquesta factura <b>%s</b>?
 DisabledBecauseReplacedInvoice=Acció desactivada perquè és una factura reemplaçada
-DescTaxAndDividendsArea=Aquesta àrea presenta un resum de tots els pagaments fets per a despeses especials.  Aquí només s'inclouen registres amb pagament durant l'any fixat.
-NbOfPayments=Nº de pagaments
+DescTaxAndDividendsArea=Aquesta pantalla resumeix la llista de tots els impostos i les càrregues socials exigides per a un any determinat. La data presa en compte és el període de pagament.
+NbOfPayments=No. of payments
 SplitDiscount=Dividir el dte. en dos
-ConfirmSplitDiscount=Estàs segur que vols dividir aquest descompte de <b>%s</b> %s en 2 descomptes més baixos?
-TypeAmountOfEachNewDiscount=Indiqui l'import per a cada part:
-TotalOfTwoDiscountMustEqualsOriginal=La suma de l'import dels 2 nous descomptes deu ser la mateixa que l'import del descompte a dividir.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Vols eliminar aquest descompte?
 RelatedBill=Factura relacionada
 RelatedBills=Factures relacionades
 RelatedCustomerInvoices=Factures de client relacionades
 RelatedSupplierInvoices=Factures de proveïdor relacionades
 LatestRelatedBill=Última factura relacionada
-WarningBillExist=Advertència, una o més factures ja existeixen
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Eina de fusió PDF
 AmountPaymentDistributedOnInvoice=Import de pagament distribuït en la factura
-PaymentOnDifferentThirdBills=Permet fer pagaments en factures de diferents tercers però de la mateixa empresa mare
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Nota de pagament
 ListOfPreviousSituationInvoices=Llista de factures de situació anteriors
 ListOfNextSituationInvoices=Llista de factures de situació següents
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+ListOfSituationInvoices=Llista de factures de situació
+CurrentSituationTotal=Situació actual total
+DisabledBecauseNotEnouthCreditNote=Per eliminar una factura de situació del cicle, el total de la nota de crèdit d'aquesta factura ha de cobrir aquest total de la factura
+RemoveSituationFromCycle=Treu aquesta factura del cicle
+ConfirmRemoveSituationFromCycle=Vols eliminar aquesta factura %s del cicle?
+ConfirmOuting=Confirma la sortida
 FrequencyPer_d=Cada %s dies
 FrequencyPer_m=Cada %s mesos
 FrequencyPer_y=Cada %s anys
@@ -394,7 +396,7 @@ PaymentConditionShort14DENDMONTH=14 dies final de mes
 PaymentCondition14DENDMONTH=En els 14 dies següents a final de mes
 FixAmount=Import fixe
 VarAmount=Import variable (%% total)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountOneLine=Quantitat variable (%% tot.) - 1 línia amb l'etiqueta '%s'
 # PaymentType
 PaymentTypeVIR=Transferència bancària
 PaymentTypeShortVIR=Transferència bancària
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Xec
 PaymentTypeShortCHQ=Xec
 PaymentTypeTIP=TIP (Documents contra pagament)
 PaymentTypeShortTIP=Pagament TIP
-PaymentTypeVAD=Pagament On Line
-PaymentTypeShortVAD=Pagament On Line
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Banc esborrany
 PaymentTypeShortTRA=Esborrany
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Dades bancàries
 BankCode=Codi banc
-DeskCode=Codi oficina
+DeskCode=Office code
 BankAccountNumber=Número compte
-BankAccountNumberKey=D. C.
+BankAccountNumberKey=Check digits
 Residence=Domiciliació bancària
-IBANNumber=Codi IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=Codi BIC/SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Pagament mitjançant transferència sobre el
 VATIsNotUsedForInvoice=* IVA no aplicable art-293B del CGI
 LawApplicationPart1=Per aplicació de la llei 80.335 de 12.05.80
 LawApplicationPart2=les mercaderies romanen en propietat de
-LawApplicationPart3=venedor fins al cobrament de
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=els seus preus
 LimitedLiabilityCompanyCapital=SRL amb capital de
 UseLine=Aplicar
@@ -463,7 +465,7 @@ Cheques=Xecs
 DepositId=Id. dipòsit
 NbCheque=Número de xecs
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Utilitzar l'adreça del contacte de client de facturació de la factura en comptes de la direcció del tercer com a destinatari de les factures
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Mostrar tots els pendents
 ShowUnpaidLateOnly=Mostrar els pendents en retard només
 PaymentInvoiceRef=Pagament factura %s
@@ -474,21 +476,22 @@ Reported=Ajornat
 DisabledBecausePayments=No disponible ja que hi ha pagaments
 CantRemovePaymentWithOneInvoicePaid=Eliminació impossible quan hi ha almenys una factura classificada com a pagada.
 ExpectedToPay=Esperant el pagament
-CantRemoveConciliatedPayment=No es pot eliminar la conciliació de pagament
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Pagada per aquest pagament
-ClosePaidInvoicesAutomatically=Classificar com "Pagades" totes les factures estàndards, de situació o rectificatives completament pagades.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classifica com "Pagats" tots els abonaments completament reemborsats
-ClosePaidContributionsAutomatically=Classifica com "Pagades" tots els impostos varis pagats completament.
-AllCompletelyPayedInvoiceWillBeClosed=Totes les factures amb una resta a pagar 0 seran automàticament tancades a l'estat "Pagada".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
 ListOfYourUnpaidInvoices=Llistat de factures impagades
 NoteListOfYourUnpaidInvoices=Nota: Aquest llistat només conté factures de tercers que tens enllaçats com a agent comercial.
 RevenueStamp=Timbre fiscal
-YouMustCreateInvoiceFromThird=Aquesta opció només està disponible al moment de crear una factura des de la llengüeta "client" de tercers
-YouMustCreateInvoiceFromSupplierThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "proveïdor" del tercer
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Primer has de crear una factura estàndard i convertir-la en "plantilla" per crear una nova plantilla de factura
 PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
 TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
 MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures de dipòsit i %syymm-nnnn pels abonaments  on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense retorn a 0
@@ -513,9 +516,9 @@ SituationAmount=Import (sense IVA) de la factura de situació
 SituationDeduction=Situació d'exportació
 ModifyAllLines=Modificar totes les línies
 CreateNextSituationInvoice=Crea la següent situació
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+ErrorFindNextSituationInvoice=Error no es pot trobar el següent cicle de situació ref
+ErrorOutingSituationInvoiceOnUpdate=No es pot fer aquesta factura de situació
+ErrorOutingSituationInvoiceCreditNote=No es pot fer cap nota de crèdit vinculada.
 NotLastInCycle=Aquesta factura no és l'última en el cicle i no es pot modificar.
 DisabledBecauseNotLastInCycle=Ja existeix la següent situació.
 DisabledBecauseFinal=Aquesta situació és definitiva.
@@ -533,7 +536,7 @@ invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o
 updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
 ToCreateARecurringInvoice=Per crear una factura recurrent d'aquest contracte, primer crea aquesta factura esborrany, després converteix-la en una plantilla de factura i defineix la freqüència per a la generació de factures futures.
 ToCreateARecurringInvoiceGene=Per generar futures factures regulars i manualment, només ves al menú <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada automàticament, pregunta a l'administrador per habilitar i configurar el mòdul <strong>%s</strong>. Tingues en compte que ambdós mètodes (manual i automàtic) es poden utilitzar alhora sense risc de duplicats.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
 CreateOneBillByThird=Crea una factura per tercer (per la resta, una factura per comanda)
@@ -545,4 +548,5 @@ AutoFillDateFrom=Estableix la data d'inici de la línia de serveis amb la data d
 AutoFillDateFromShort=Estableix la data d'inici
 AutoFillDateTo=Estableix la data de finalització de la línia de serveis amb la següent data de la factura
 AutoFillDateToShort=Estableix la data de finalització
-MaxNumberOfGenerationReached=Max number of gen. reached
+MaxNumberOfGenerationReached=Nombre màxim de gen. arribat
+BILL_DELETEInDolibarr=Factura esborrada
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index c4909443347..2f99c50625f 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Veure empresa
 ShowStock=Veure magatzem
 DeleteArticle=Feu clic per treure aquest article
 FilterRefOrLabelOrBC=Cerca (Ref/Etiq.)
-UserNeedPermissionToEditStockToUsePos=Vostè pregunta per disminuir l'estoc en la creació de factures, per aixo l'usuari que utilitzi el TPV ha de tenir permís per editar l'estoc
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Impressora de tickets de Dolibarr
+PointOfSale=Terminals Punt de Venda
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 912d7ac4fb7..56c55021c04 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Trucada telefònica
 ActionAC_FAX=Envia Fax
 ActionAC_PROP=Envia pressupost per e-mail
 ActionAC_EMAIL=Envia e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Cita
 ActionAC_INT=Lloc d'intervenció
 ActionAC_FAC=Envia factura de client per e-mail
@@ -72,8 +73,8 @@ StatusProsp=Estat del pressupost
 DraftPropals=Pressupostos esborrany
 NoLimit=Sense límit
 ToOfferALinkForOnlineSignature=Enllaç per a la signatura en línia
-WelcomeOnOnlineSignaturePage=Benvingut a la pàgina per acceptar propostes comercials de %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=Aquesta pantalla us permet acceptar i signar, o rebutjar, una cotització / proposta comercial
 ThisIsInformationOnDocumentToSign=Es tracta d'informació sobre el document per acceptar o rebutjar
-SignatureProposalRef=Signatura de pressupost / proposta comercial %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=La funcionalitat de signatura en línia estava desactivada o bé el document va ser generat abans que fos habilitada la funció
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index 2f78416bb81..e3442e2863d 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -160,7 +160,7 @@ CountryMD=Moldàvia
 CountryMN=Mongòlia
 CountryMS=Monserrat
 CountryMZ=Moçambic
-CountryMM=Birmània (Myanmar)
+CountryMM=Myanmar (Birmània)
 CountryNA=Namíbia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinité-et-Tobago
 CountryTR=Turquia
 CountryTM=Turkmenistan
-CountryTC=Illes Turks i Caicos
+CountryTC=Illes turques i caicos
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ucraïna
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Rupies mauritanes
 CurrencySingMUR=Rupia mauritana
 CurrencyNOK=Corones noruegues
-CurrencySingNOK=Corona noruega
+CurrencySingNOK=Cronas noruegues
 CurrencyTND=TND
 CurrencySingTND=Dinar tunisià
 CurrencyUSD=Dòlars USA
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Boca a boca
 DemandReasonTypeSRC_PARTNER=Soci
 DemandReasonTypeSRC_EMPLOYEE=Empleat
 DemandReasonTypeSRC_SPONSORING=Patrocinador
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 53676bb22e7..26cdb779153 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nº de documents
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Carpeta
 ECMSectionManual=Carpeta manual
 ECMSectionAuto=Carpeta automàtica
@@ -34,18 +34,19 @@ ECMDocsByProjects=Documents enllaçats a projectes
 ECMDocsByUsers=Documents referents a usuaris
 ECMDocsByInterventions=Documents relacionats amb les intervencions
 ECMDocsByExpenseReports=Documents relacionats als informes de despeses
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No s'ha creat carpeta
 ShowECMSection=Mostrar carpeta
 DeleteSection=Eliminació carpeta
 ConfirmDeleteSection=Vols eliminar el directori <b>%s</b>?
 ECMDirectoryForFiles=Carpeta relativa per a fitxers
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=L'eliminació no és possible perquè conté alguns fitxers o subdirectoris
+CannotRemoveDirectoryContainsFiles=L'eliminació no és possible perquè conté alguns fitxers
 ECMFileManager=Explorador de fitxers
 ECMSelectASection=Seleccioneu una carpeta en l'arbre...
 DirNotSynchronizedSyncFirst=Aquest directori sembla que s'ha creat o modificat fora del mòdul ECM. Heu de prémer el botó "Resincronitzar" per sincronitzar el disc i la base de dades per obtenir el contingut d'aquest directori.
 ReSyncListOfDir=Resincronitzar la llista de directoris
 HashOfFileContent=Resum matemàtic ("hash") del contingut del fitxer
-FileNotYetIndexedInDatabase=Fitxer encara no indexat a la base de dades (intenteu pujant-lo de nou)
-FileSharedViaALink=Fitxer compartit a través d'un enllaç
 NoDirectoriesFound=No s'han trobat directoris
+FileNotYetIndexedInDatabase=Fitxer encara no indexat a la base de dades (intenteu pujant-lo de nou)
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 12fc104f2f7..48880963224 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=El client SOAP ha fallat amb l'error '%s'
 ErrorGlobalVariableUpdater5=Sense variable global seleccionada
 ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de ser un valor numèric
 ErrorMandatoryParametersNotProvided=Paràmetre/s obligatori/s no definits
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú Array en el descriptor del mòdul (valor incorrecte per a la clau fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=El codi de barres de producte %s ja existeix en
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que no és possible tenir un producte virtual amb auto increment/decrement de subproductes quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot.
 ErrorDescRequiredForFreeProductLines=La descripció és obligatòria per a línies amb producte de lliure edició
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
diff --git a/htdocs/langs/ca_ES/help.lang b/htdocs/langs/ca_ES/help.lang
index e76e98004e2..ecc5e1dd719 100644
--- a/htdocs/langs/ca_ES/help.lang
+++ b/htdocs/langs/ca_ES/help.lang
@@ -5,8 +5,8 @@ RemoteControlSupport=Assistència en temps real a distància
 OtherSupport=Altres tipus d'assistència
 ToSeeListOfAvailableRessources=Per contactar/veure els recursos disponibles:
 HelpCenter=Centre  d'assistència
-DolibarrHelpCenter=Centre de suport i ajuda Dolibarr
-ToGoBackToDolibarr=D'altra banda, faci clic <a href="%s">aquí per utilitzar Dolibarr</a>
+DolibarrHelpCenter=Centre d'Ajuda i Suport de Dolibarr
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
 TypeOfSupport=Tipus de suport
 TypeSupportCommunauty=Comunitari (gratuït)
 TypeSupportCommercial=Comercial
@@ -15,12 +15,9 @@ NeedHelpCenter=Necessites ajuda o suport?
 Efficiency=Eficàcia
 TypeHelpOnly=Només ajuda
 TypeHelpDev=Ajuda+Desenvolupament
-TypeHelpDevForm=Ajuda+Desenvolupament+Formació
-ToGetHelpGoOnSparkAngels1=Algunes empreses o independents ofereixen serveis de suport molt ràpid (de vegades d'immediat) i més eficients gràcies a la capacitat de control remot del seu equip per ajudar a diagnosticar i resoldre els seus problemes. Aquesta assistència es pot trobar a la borsa d'assistents de <b>%s</b>:
-ToGetHelpGoOnSparkAngels3=Per accedir a la recerca de <b>assistents disponibles</b>, feu clic aquí
-ToGetHelpGoOnSparkAngels2=En ocasions, cap operador es troba disponible en el moment de la seva recerca, no oblideu canviar el criteri de cerca indicant "tots els disponibles". Pot, doncs, posar-se en contacte en diferit.
-BackToHelpCenter=Sinó, feu clic aquí per <a href="%s"> tornar al centre d'assistència</a>.
-LinkToGoldMember=En cas contrari, podeu trucar immediatament a un dels assistents preseleccionats per Dolibarr per al seu idioma (%s) fent clic en el seu widget (disponibilitat i tarifa màxima actualitzades automàticament):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Idiomes disponibles
-SubscribeToFoundation=Ajuda al projecte Dolibarr, adhereix-te a l'associació
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Per suport oficial de Dolibar amb el teu llenguatge:<br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index f24eaf1d822..6aec4a69a59 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=RRHH
-Holidays=Dies lliures
-CPTitreMenu=Dies lliures
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Estat mensual
 MenuAddCP=Nova petició de dia lliure
-NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Realitzar una petició de dies lliures
 DateDebCP=Data inici
 DateFinCP=Data fi
@@ -15,18 +15,18 @@ ApprovedCP=Aprovada
 CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
-ListeCP=Llista de dies lliures
+ListeCP=List of leave
 LeaveId=Identificador de baixa
 ReviewedByCP=Serà revisada per
 UserForApprovalID=Usuari per al ID d'aprovació
-UserForApprovalFirstname=Nom de l'usuari d'aprovació
-UserForApprovalLastname=Cognom de l'usuari d'aprovació
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login de l'usuari d'aprovació
 DescCP=Descripció
 SendRequestCP=Enviar la petició de dies lliures
 DelayToRequestCP=Les peticions de dies lliures s'han de realitzar al menys <b>%s dies</b> abans.
-MenuConfCP=Saldo de dies lliures
-SoldeCPUser=El seu saldo de dies lliures es de <b>%s dies</b>
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici.
 ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació:
 ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de dies lliures no existeix
@@ -39,16 +39,10 @@ TypeOfLeaveId=Tipus d'identificador de baixa
 TypeOfLeaveCode=Tipus de codi de baixa
 TypeOfLeaveLabel=Tipus d'etiqueta de baixa
 NbUseDaysCP=Nombre de dies lliures consumits
-<<<<<<< HEAD
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-=======
 NbUseDaysCPShort=Dies consumits
 NbUseDaysCPShortInMonth=Dies consumits al mes
 DateStartInMonth=Data d'inici al mes
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-DateEndInMonth=End date in month
+DateEndInMonth=Data de finalització al mes
 EditCP=Modificar
 DeleteCP=Eliminar
 ActionRefuseCP=Rebutja
@@ -103,16 +97,12 @@ AllHolidays=Totes les sol·licituds de permís
 HalfDay=Mig dia
 NotTheAssignedApprover=No sou l'aprovador assignat
 LEAVE_PAID=Vacances pagades
-<<<<<<< HEAD
-LEAVE_SICK=Sick leave
-=======
 LEAVE_SICK=Baixa per enfermetat
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-LEAVE_OTHER=Other leave
+LEAVE_OTHER=Altres sortides
 LEAVE_PAID_FR=Vacances pagades
 ## Configuration du Module ##
-LastUpdateCP=Última actualització automàtica de reserva de dies lliures
-MonthOfLastMonthlyUpdate=Mes de l'última actualització automàtica de reserva de dies lliures
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Actualització efectuada correctament.
 Module27130Name= Gestió de dies lliures
 Module27130Desc= Gestió de dies lliures
@@ -122,7 +112,7 @@ NoticePeriod=Preavís
 HolidaysToValidate=Dies lliures retribuïts a validar
 HolidaysToValidateBody=A continuació trobara una sol·licitud de dies lliures retribuïts per validar
 HolidaysToValidateDelay=Aquesta sol·licitud de dies lliures retribuïts tindrà lloc en un termini de menys de %s dies.
-HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies lliures retribuïts no disposa de suficients dies disponibles
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Dies lliures retribuïts valids
 HolidaysValidatedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut validada.
 HolidaysRefused=Dies lliures retribuïts denegats
@@ -131,4 +121,9 @@ HolidaysCanceled=Dies lliures retribuïts cancel·lats
 HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada.
 FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
 NoLeaveWithCounterDefined=No s'han definit els tipus de dies lliures que son necessaris per poder seguir-los amb comptador
-GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per configurar els diferents tipus de dies lliures
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index a1ce071cf25..3db6924016a 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Segueix les instruccions pas a pas.
 MiscellaneousChecks=Comprovació dels prerequisits
 ConfFileExists=L'arxiu de configuració <b>%s</b> existeix.
-ConfFileDoesNotExistsAndCouldNotBeCreated=El fitxer de configuració <b>%s</b> no existeix i no s'ha creat!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=L'arxiu de configuració <b>%s</b> s'ha creat.
-ConfFileIsNotWritable=L'arxiu de configuració <b>%s</b> no és modificable. Comprova els permisos. Per a una primera instal·lació, el servidor web ha de tenir el dret a modificar aquest fitxer durant el procés de configuració (per exemple "chmod 666" sobre un SO compatible UNIX).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=L'arxiu <b>%s</b> és modificable.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Recarregar tota la informació de l'arxiu de configuració.
+ConfFileMustBeAFileNotADir=El fitxer de configuració <b> %s</b> ha de ser un fitxer, no un directori.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Aquest PHP suporta sessions
 PHPSupportPOSTGETOk=Aquest PHP suporta bé les variables POST i GET.
-PHPSupportPOSTGETKo=És possible que aquest PHP no suport les variables POST i/o GET. Comproveu el paràmetre <b>variables_order</b> del php.ini.
-PHPSupportGD=Aquest PHP suporta les funcions gràfiques GD.
-PHPSupportCurl=Aquest PHP suporta Curl.
-PHPSupportUTF8=Aquest PHP suporta les funcions UTFB.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=Aquest PHP és compatible amb les funcions gràfiques GD.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=Aquest PHP és compatible amb les funcions UTF8.
 PHPMemoryOK=La seva memòria màxima de sessió PHP està definida a <b>%s</b>. Això hauria de ser suficient.
-PHPMemoryTooLow=La seva memòria màxima de sessió PHP està definida a <b>%s</b> bytes. Això és molt poc. Es recomana modificar el paràmetre <b>memory_limit</b> del seu arxiu <b> php.ini</b> a almenys <b>%s</b> octets.
-Recheck=Faci clic aquí per realitzar un test més exhaustiu
-ErrorPHPDoesNotSupportSessions=La seva instal·lació de PHP no suporta les sessions. Aquesta funcionalitat és necessària per fer funcionar a Dolibarr. Comprovi la seva configuració de PHP.
-ErrorPHPDoesNotSupportGD=Aquest PHP no suporta les funcions gràfiques GD. Cap gràfic estarà disponible.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=La teva instal·lació PHP no soporta Curl.
-ErrorPHPDoesNotSupportUTF8=Aquest PHP no suporta les funcions UTF8. Resolgui el problema abans d'instal lar Dolibarr ja que no funcionarà correctamete.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=La carpeta <b>%s</b> no existeix o no és accessible.
-ErrorGoBackAndCorrectParameters=Torna enrera i corregeix els paràmetres incorrectes.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Ha indicat potser un valor incorrecte per al paràmetre '%s'.
 ErrorFailedToCreateDatabase=Error en crear la base de dades '%s'.
 ErrorFailedToConnectToDatabase=Error de connexió a la base de dades '%s'.
 ErrorDatabaseVersionTooLow=Versió de la base de dades (%s) demasiado antigua. massa antiga. Es requereix versió %s o superior.
 ErrorPHPVersionTooLow=Versió del PHP massa antiga. Es requereix versió %s o superior.
-ErrorConnectedButDatabaseNotFound=La connexió al servidor és correcta però no es troba la base de dades '%s'
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=La base de dades '%s' ja existeix.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de dades no existeix, torna enrera i activa l'opció "Crear base de dades"
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Si la base de dades ja existeix, torna enrera i desactiva l'opció "Crear base de dades".
-WarningBrowserTooOld=El seu navegador és molt antic. Es recomana que actualitzeu a una versió recent de Firefox, Chrome o Opera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Versió PHP
 License=Llicència d'ús
 ConfigurationFile=Arxiu de configuració
@@ -45,22 +45,23 @@ DolibarrDatabase=Base de dades Dolibarr
 DatabaseType=Tipus de la base de dades
 DriverType=Tipus del driver
 Server=Servidor
-ServerAddressDescription=Nom o adreça IP del servidor de base de dades, generalment 'localhost' quan el servidor es troba en la mateixa màquina que el lloc web
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Port del servidor de la base de dades. Deixa-ho en blanc si ho desconeixes.
 DatabaseServer=Servidor de la base de dades
 DatabaseName=Nom de la base de dades
-DatabasePrefix=Prefixe per a les taules
-AdminLogin=Usuari de l'administrador de la base de dades Dolibarr.
-PasswordAgain=Verificació de la contrasenya
+DatabasePrefix=Prefix en les taules de base de dades
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Contrasenya de l'administrador de la base de dades Dolibarr.
 CreateDatabase=Crear la base de dades
-CreateUser=Crea el propietari o concedeix-li permís en la base de dades
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Base de dades - Accés super usuari
-CheckToCreateDatabase=Seleccioneu aquesta opció si la base de dades no existeix i s'ha de crear. En aquest cas, cal indicar usuari/contrasenya de superusuari, més endavant en aquesta pàgina.
-CheckToCreateUser=Marca la casella de verificació si el propietari de la base de dades no existeix i s'ha de crear, o si existeix, però la base de dades no existeix i els permisos s'han de concedir. <br>En aquest cas, has de triar el seu nom d'usuari i contrasenya i també omplir el nom d'usuari i contrasenya del compte superusuari al final d'aquesta pàgina.  Si aquesta casella no està activada, el propietari de la base de dades i les seves contrasenyes han d'existir.
-DatabaseRootLoginDescription=Usuari de la base que té els drets de creació de bases de dades o compte per a la base de dades, inútil si la base de dades i el seu usuari ja existeixen (com quan estan en un amfitrió).
-KeepEmptyIfNoPassword=Deixa-ho en blanc si l'usuari no té contrasenya (evita-ho)
-SaveConfigurationFile=Gravació del fitxer de configuració
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Connexió al servidor
 DatabaseCreation=Creació de la base de dades
 CreateDatabaseObjects=Creació dels objectes de la base de dades
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Creació de les claus i índexs de la taula %s
 OtherKeysCreation=Creació de les claus i índexs
 FunctionsCreation=Creació de funcions
 AdminAccountCreation=Creació del compte administrador
-PleaseTypePassword=Indiqui una contrasenya, no s'accepten les contrasenyes buides!
-PleaseTypeALogin=Indiqui un usuari!
-PasswordsMismatch=Les contrasenyes no coincideixen, torni a intentar-ho!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Fi de la configuració
 SystemIsInstalled=La instal·lació s'ha finalitzat.
 SystemIsUpgraded=S'ha actualitzat Dolibarr correctament.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Ara ha de configurar Dolibarr segons les seves necessi
 AdminLoginCreatedSuccessfuly=El codi d'usuari administrador de Dolibar '<b>%s</b>' s'ha creat correctament.
 GoToDolibarr=Ves a Dolibarr
 GoToSetupArea=Ves a Dolibarr (àrea de configuració)
-MigrationNotFinished=La versió de la base de dades encara no està completament a nivell, per la qual cosa haureu de reiniciar una migració.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Ves de nou a la pàgina d'actualització
 WithNoSlashAtTheEnd=Sense el signe "/" al final
-DirectoryRecommendation=Es recomana posar aquesta carpeta fora de la carpeta de les pàgines web.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Ja existeix
 DolibarrAdminLogin=Login de l'usuari administrador de Dolibarr
-AdminLoginAlreadyExists=El compte d'administrador Dolibarr '<b>%s</b>' ja existeix. Torna enrera si vols crear un altre.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=No s'ha pogut crear el compte d'administrador de Dolibarr.
-WarningRemoveInstallDir=Atenció, per raons de seguretat, amb la finalitat de bloquejar un nou ús de les eines d'instal·lació/actualització, és aconsellable crear en el directori arrel de Dolibarr un arxiu anomenat <b>install.lock </b> en només lectura.
-FunctionNotAvailableInThisPHP=No disponible en aquest PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=No està disponible en aquest PHP
 ChoosedMigrateScript=Elecció de l'script de migració
 DataMigration=Migració de la base de dades (dades)
 DatabaseMigration=Migració de la base de dades (estructura + algunes dades)
 ProcessMigrateScript=Execució del script
 ChooseYourSetupMode=Tria el teu mètode d'instal·lació i fes clic a "Començar"
 FreshInstall=Nova instal·lació
-FreshInstallDesc=Utilitza aquest mètode si és la teva primera instal·lació. Si no és el cas, aquest mètode pot reparar una instal·lació anterior incompleta, però si vols actualitzar la teva versió anterior, tria el mètode "Actualització"
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Actualització
 UpgradeDesc=Utilitzeu aquest mètode després d'haver actualitzat els fitxers d'una instal·lació Dolibarr antiga pels d'una versió més recent. Aquesta elecció permet posar al dia la base de dades i les seves dades per a aquesta nova versió.
 Start=Començar
 InstallNotAllowed=Instal·lació no autoritzada per els permisos de l'arxiu <b>conf.php</b>
 YouMustCreateWithPermission=Ha de crear un fitxer %s i donar-li els drets d'escriptura al servidor web durant el procés d'instal·lació.
-CorrectProblemAndReloadPage=Corregiu el problema i <a href="%s"> recarregi la pàgina </a> (Tecla F5).
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Ja migrada
 DatabaseVersion=Versió de la base de dades
 ServerVersion=Versió del servidor de la base de dades
 YouMustCreateItAndAllowServerToWrite=Cal crear aquest expedient i permetre al servidor web escriure en ell
 DBSortingCollation=Ordre de selecció utilitzat per la base de dades
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Ha vollgut crear la base de dades <b>%s</b>, però per a això Dolibarr ha de connectar amb el servidor <b>%s</b> via el superusuari <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Ha vollgut crear el login d'accés a la base de dades <b>%s</b>, però per a això Dolibarr ha de connectar amb el servidor <b>%s</b> via el superusuari <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=La connexió falla, els paràmetres del servidor o el superusuari poden ser incorrectes.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Pagaments orfes detectats pel mètode %s
 RemoveItManuallyAndPressF5ToContinue=Esborreu manualment i premeu F5 per continuar.
 FieldRenamed=Camp renombrat
-IfLoginDoesNotExistsCheckCreateUser=Si l'login encara no existeix, ha de seleccionar l'opció "Creació de l'usuari"
-ErrorConnection=El servidor "<b>%s </b>", base de dades "<b>%s</b>", login "<b>%s</b>", o la contrasenya de la base de dades poden ser incorrectes o la versió de PHP molt vella en comparació amb la versió de la base de dades.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Opció recomanada per a instal·lar la versió <b>%s</b> sobre la seva actual versió <b>%s</b>
 InstallChoiceSuggested=<b>Opció suggerida per l'instal·lador</b>.
-MigrateIsDoneStepByStep=La versió destí (% s) té una diferència de diverses versions, una vegada conclosa aquesta migració, l'instal tornarà a proposar la següent.
-CheckThatDatabasenameIsCorrect=Comproveu que el nom de la base de dades "<b>%s</b>" és correcte.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Si el nom és correcte i la base de dades no existeix, heu de seleccionar l'opció "Crear la base de dades"
 OpenBaseDir=Paràmetre php openbasedir
-YouAskToCreateDatabaseSoRootRequired=Ha marcat la casella "Crear la base de dades". Per això, l'usuari/contrasenya del superusuari (al final del formulari) són obligatoris.
-YouAskToCreateDatabaseUserSoRootRequired=Ha marcat la casella "Crear l'usuari propietari" de la base de dades. Per això, l'usuari/contrasenya del superusuari (al final del formulari) són obligatoris.
-NextStepMightLastALongTime=El següent pas pot trigar diversos minuts. Després d'haver validat, li agraïm esperi a la completa visualització de la pàgina següent per continuar.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Actualització de les dades de expedicions de comandes de clients
 MigrationShippingDelivery=Actualització de les dades de expedicions
 MigrationShippingDelivery2=Actualització de les dades expedicions 2
 MigrationFinished=Acabada l'actualització
-LastStepDesc=<strong>Últim pas</strong>: Indiqueu aquí el compte i la contrasenya del primer usuari que fareu servir per connectar-se a l'aplicació. No perdi aquests identificadors, és el compte que permet administrar la resta.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
-WarningUpgrade=Atenció:\nVas fer una còpia de seguretat de la base de dades abans?\nAixò és altament recomanable: per exemple, degut a alguns problemes dels sistemes de base de dades (per exemple mysql versió 5.5.40/41/42/43), alguna dada o taules poden perdre's durant aquest procés, així doncs és molt recomanable tenir un bolcat de la teva base de dades abans de començar la migració.\n\nClica OK per a començar el procés de migració....
-ErrorDatabaseVersionForbiddenForMigration=La versió de la seva base de dades és %s. Aquesta te un error crític i es poden perdre dades si es fa un canvi a l'estructura de la base de dades i per fer l'actualització necessita fer aquests canvis. Per aquesta raó, la migració no es permetrà fins que s'actualitzi la seva base de dades a una versió estable i/o superior (llista de versions afectades: %s)
-KeepDefaultValuesWamp=Estàs utilitzant l'assistent d'instal·lació de DoliWamp amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent.
-KeepDefaultValuesDeb=Estàs utilitzant l'assistent d'instal·lació Dolibarr d'un paquet Linux (Ubuntu, Debian, Fedora...) amb els valors proposats més òptims. Només cal completar la contrasenya del propietari de la base de dades a crear. Canvia els altres paràmetres només si estàs segur del que estàs fent.
-KeepDefaultValuesMamp=Estàs utilitzant l'assistent d'instal·lació de DoliMamp amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent.
-KeepDefaultValuesProxmox=Estàs utilitzant l'assistent d'instal·lació de Dolibarr des d'una màquina virtual Proxmox amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent.
-UpgradeExternalModule=Executa el procés d'actualització dedicat de mòduls externs
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Estableix com a mínim una opció com a paràmetre a l'URL. Per exemple: '... repair.php?standard=confirmed'
 NothingToDelete=Res per netejar / esborrar
 NothingToDo=No hi ha res a fer
@@ -147,11 +148,11 @@ NothingToDo=No hi ha res a fer
 # upgrade
 MigrationFixData=Correcció de dades desnormalitzades
 MigrationOrder=Migració de dades de les comandes clients
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=Migració de dades per a comandes de proveïdors
 MigrationProposal=Migració de dades de pressupostos
 MigrationInvoice=Migració de dades de les factures a clients
 MigrationContract=Migració de dades dels contractes
-MigrationSuccessfullUpdate=Actualització correcta
+MigrationSuccessfullUpdate=Actualització finalitzada
 MigrationUpdateFailed=L'actualització ha fallat
 MigrationRelationshipTables=Migració de les taules de relació (%s)
 MigrationPaymentsUpdate=Actualització dels pagaments (vincle nn pagaments-factures)
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Actualització dels contractes sense detalls (gestió d
 MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
 MigrationContractsLineCreation=Creació linia contracte per contracte Ref. %s
 MigrationContractsNothingToUpdate=No hi ha més contractes (vinculats a un producte) sense línies de detalls que hagin de corregir.
-MigrationContractsFieldDontExist=Els camps fk_facture no existeixen ja. No hi ha operació pendent.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Actualització de les dades de contractes no indicades
-MigrationContractsEmptyDatesUpdateSuccess=S'ha fet correctament la correcció de la data buida de contracte
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No hi ha més properes dates de contractes.
 MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha més properes dates de creació.
 MigrationContractsInvalidDatesUpdate=Actualització dades contracte incorrectes (per contractes amb detall en servei)
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Actualitzar recepcions
 MigrationStockDetail=Actualitzar valor en stock dels productes
 MigrationMenusDetail=Actualització de la taula de menús dinàmics
 MigrationDeliveryAddress=Actualització de les adreces d'enviament en les notes de lliurament
-MigrationProjectTaskActors=Migració de la taula llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migració del camp fk_user_resp de llx_projet a llx_element_contact
 MigrationProjectTaskTime=Actualitza el temps dedicat en segons
 MigrationActioncommElement=Actualització de les dades de accions sobre elements
 MigrationPaymentMode=Actualització de les formes de pagament
 MigrationCategorieAssociation=Actualització de les categories
-MigrationEvents=Migració d'esdeveniments per afegir propietari a la taula d'asignació
-MigrationEventsContact=Migració d'esdeveniments per afegir contacte d'esdeveniments a la taula d'assignacions
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Actualitza el valor del camp entity de llx_societe_remise
 MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_remise_except
 MigrationUserRightsEntity=Actualitza el valor del camp de l'entitat llx_user_rights
 MigrationUserGroupRightsEntity=Actualitza el valor del camp de l'entitat llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Recarrega el mòdul %s
 MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7
-ShowNotAvailableOptions=Mostra opcions no disponibles
-HideNotAvailableOptions=Amaga opcions no disponibles
-ErrorFoundDuringMigration=S'ha reportat un error durant el procés de migració, de manera que el proper pas no està disponible. Per ignorar els errors, pots fer <a href="%s">clic aqui</a>, però l'aplicació o algunes funcionalitats podrien no funcionar correctament fins que no es corregeixi.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Fes clic aquí per anar a la teva aplicació
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index f183e34519b..e9470b4824c 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contactes d'aquest tercer
 ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
 AddressesForCompany=Adreces d'aquest tercer
 ActionsOnCompany=Esdeveniments respecte aquest tercer
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Esdeveniments d'aquest soci
 ActionsOnProduct=Esdeveniments sobre aquest producte
 NActionsLate=%s en retard
@@ -847,9 +848,9 @@ ModuleBuilder=Creador de mòdul
 SetMultiCurrencyCode=Estableix moneda
 BulkActions=Accions massives
 ClickToShowHelp=Fes clic per mostrar l'ajuda desplegable
-WebSite=Lloc web
-WebSites=Llocs web
-WebSiteAccounts=Comptes de lloc web
+WebSite=Website
+WebSites=Pàgines web
+WebSiteAccounts=Website accounts
 ExpenseReport=Informe de despeses
 ExpenseReports=Informes de despeses
 HR=RRHH
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Fitxer compartit a través d'un enllaç
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=Actualment esteu en el mode %s "sandbox"
+Inventory=Inventari
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 024158f0e0c..5b044952637 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Objecte adjuntat
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nAquest és un correu electrònic de prova enviat a __EMAIL__.\nLes dues línies estan separades per un salt de línia.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nAquest és un correu electrònic de <b>prova</b> (la paraula prova ha d'estar en negreta). <br> Les dues línies es separen amb un salt de línia. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Configuració del mòdul de pàgina web
 WEBSITE_PAGEURL=URL de pàgina
 WEBSITE_TITLE=Títol
 WEBSITE_DESCRIPTION=Descripció
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Paraules clau
 LinesToImport=Línies per importar
diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang
index c877a80a285..18653181e2c 100644
--- a/htdocs/langs/ca_ES/paybox.lang
+++ b/htdocs/langs/ca_ES/paybox.lang
@@ -20,6 +20,7 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL que ofereix una interfície de cobrame
 ToOfferALinkForOnlinePaymentOnContractLine=URL que ofereix una interfície de pagament en línia %s basada en l'import d'una línia de contracte
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que ofereix una interfície de pagament en línia %s basada en un impport llíure
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL que ofereix una interfície de pagament en línia %s per una quota de soci
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=També pot afegir el paràmetre url <b>&tag=<i>value</i></b> per a qualsevol d'aquestes adreces (obligatori només per al pagament lliure) per veure el seu propi codi de comentari de pagament.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Aquesta pàgina confirma que el pagament s'ha registrat correctament. Gràcies.
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index a5e056a6f9c..a2a9d818b0c 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signat (a facturar)
 PropalStatusNotSigned=No signat (tancat)
 PropalStatusBilled=Facturat
 PropalStatusDraftShort=Esborrany
-PropalStatusValidatedShort=Validat
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Tancat
 PropalStatusSignedShort=Signat
 PropalStatusNotSignedShort=No signat
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Pressupost %s inexistent
 AddToDraftProposals=Afegir a pressupost esborrany
 NoDraftProposals=Sense pressupostos esborrany
 CopyPropalFrom=Crea un pressupost per còpia d'un d'existent
-CreateEmptyPropal=Crea pressupost buit
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Termini de validesa per defecte (en dies)
-UseCustomerContactAsPropalRecipientIfExist=Utilitzar adreça contacte de seguiment de client definit en comptes de la direcció del tercer com a destinatari dels pressupostos
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clonar pressupost
 ConfirmClonePropal=Estàs segur que vols clonar la proposta comercial <b>%s</b>?
 ConfirmReOpenProp=Estàs segur que vols tornar a obrir la proposta comercial <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Contacte client seguiment pressupost
 TypeContact_propal_external_SHIPPING=Contacte del client pel lliurament
 # Document models
 DocModelAzurDescription=Model de pressupost complet (logo...)
+DocModelCyanDescription=Model de pressupost complet (logo...)
 DefaultModelPropalCreate=Model per defecte
 DefaultModelPropalToBill=Model per defecte en tancar un pressupost (a facturar)
 DefaultModelPropalClosed=Model per defecte en tancar un pressupost (no facturat)
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index b61e8c6663d..9aa9b25a40a 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -13,7 +13,7 @@ WEBSITE_CSS_INLINE=Fitxer de contingut CSS (comú a totes les pàgines)
 WEBSITE_JS_INLINE=Fitxer amb contingut Javascript (comú a totes les pàgines)
 WEBSITE_HTML_HEADER=Afegit a la part inferior de l'encapçalament HTML (comú a totes les pàgines)
 WEBSITE_ROBOT=Fitxer per robots (robots.txt)
-WEBSITE_HTACCESS=Fitxer .htaccess del lloc web
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=Encapçalament HTML (específic sols per aquesta pàgina)
 PageNameAliasHelp=Nom o àlies de la pàgina. <br> Aquest àlies també s'utilitza per construir un URL de SEO quan el lloc web es llanci des d'un Host Virtual d'un servidor web (com Apache, Nginx...). Utilitzeu el botó "<strong>%s</strong>" per editar aquest àlies.
 EditTheWebSiteForACommonHeader=Nota: si voleu definir un encapçalament personalitzat per a totes les pàgines, editeu el encapçalament al nivell del lloc en comptes de la pàgina/contenidor.
@@ -54,7 +54,7 @@ YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
-SiteAdded=Lloc web afegit
+SiteAdded=Website added
 ConfirmClonePage=Introduïu el codi/àlies de la pàgina nova i si és una traducció de la pàgina clonada.
 PageIsANewTranslation=La nova pàgina és una traducció de la pàgina actual?
 LanguageMustNotBeSameThanClonedPage=Cloneu una pàgina com a una traducció. L'idioma de la nova pàgina ha de ser diferent del llenguatge de la pàgina d'origen.
@@ -68,8 +68,8 @@ ImportSite=Import website template
 IDOfPage=Id de la pàgina
 Banner=Bàner
 BlogPost=Publicació del bloc
-WebsiteAccount=Compte de lloc web
-WebsiteAccounts=Comptes de lloc web
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Crear un compte de lloc web
 BackToListOfThirdParty=Tornar a la llista de Tercers
 DisableSiteFirst=Deshabilita primer el lloc web
@@ -78,7 +78,7 @@ AnotherContainer=Un altre contenidor
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per emmagatzemar comptes del lloc web (login/contrasenya) per a cada lloc web de tercers
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Web site editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
 GrabImagesInto=Agafa també imatges trobades dins del css i a la pàgina.
 ImagesShouldBeSavedInto=Les imatges s'han de desar al directori
@@ -89,7 +89,7 @@ CorporateHomePage=Pàgina d'inici corporativa
 EmptyPage=Pàgina buida
 ExternalURLMustStartWithHttp=L'URL externa ha de començar amb http:// o https://
 ZipOfWebsitePackageToImport=Zip file of website package
-ShowSubcontainers=Show included containers
+ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is translation of
 ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 04566302f4f..b404b57f460 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funkce zakázána v demu
 FeatureAvailableOnlyOnStable=Funkce je k dispozici pouze v oficiálních stabilních verzích
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Pouze prvky z <a href="%s">povolených modulů</a> jsou uvedeny.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Více modulů naleznete ke stažení na externích webových stránkách ...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modulové nastavení
 ModuleFamilyExperimental=Experimentální moduly
 ModuleFamilyFinancial=Finanční moduly (Účetnictví / Finance)
 ModuleFamilyECM=Elektronická správa obsahu (ECM)
-ModuleFamilyPortal=Webové stránky a další čelní aplikací
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Rozhraní s externími systémy
 MenuHandlers=Menu handlery
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Kliknutím zobrazíte popis
 DependsOn=This module needs the module(s)
 RequiredBy=Tento modul je vyžadováno modulu (modulů)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Uživatelé a skupiny
 Module0Desc=Uživatelé / zaměstnanci a vedení Skupiny
 Module1Name=Third Parties
-Module1Desc=Firmy a správu kontaktů (zákazníci, vyhlídky ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Obchodní
 Module2Desc=Obchodní řízení
 Module10Name=Účetnictví
@@ -501,7 +501,7 @@ Module23Desc=Sledování spotřeby energií
 Module25Name=Zákaznických objednávek
 Module25Desc=Zákazníka řízení
 Module30Name=Faktury
-Module30Desc=Faktura a dobropis řízení pro zákazníky. Faktura řízení pro dodavatele
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dodavatelé
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Sazby DPH nebo daň z prodeje
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Platební podmínky
 DictionaryPaymentModes=Platební režimy
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formáty papíru
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Místní taxy zprávy jsou celkové prodeje localtaxes
 LabelUsedByDefault=Label používá ve výchozím nastavení, pokud není překlad lze nalézt kód
 LabelOnDocuments=Štítek na dokumenty
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Na konci měsíce
 CurrentNext=Aktuální / Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Události bezpečnostní audit
-Audit=Audit
+Audit=Security events
 InfoDolibarr=o Dolibarr
 InfoBrowser=O prohlížeči
 InfoOS=o OS
@@ -1065,7 +1066,7 @@ BrowserName=Název prohlížeče
 BrowserOS=Prohlížeč OS
 ListOfSecurityEvents=Seznam Dolibarr událostí zabezpečení
 SecurityEventsPurged=Bezpečnostní akce očistil
-LogEventDesc=Můžete povolit zde protokolování událostí Dolibarr zabezpečení. Správci mohou potom vidět jeho obsah pomocí <b>nástrojů systému</b> menu <b>- audit.</b> Pozor, tato funkce může spotřebovat velké množství dat v databázi.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informace je různé technické informace získáte v režimu pouze pro čtení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pro správce uživatele. Žádný z Dolibarr oprávnění může snížit tento limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Krok zaokrouhlování (pro země, kde se zaokrouhlení pr
 UnitPriceOfProduct=Čistá jednotková cena produktu
 TotalPriceAfterRounding=Celková cena (bez DPH / s DPH / s DPH) po zaokrouhlení
 ParameterActiveForNextInputOnly=Parametr efektivní pro další vstup pouze
-NoEventOrNoAuditSetup=Žádná událost zabezpečení byl zaznamenán ještě. To může být normální, pokud audit nebyl povolen &quot;Nastavení - Zabezpečení - auditu&quot; stránky.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Podívejte se na místní sendmail nastavení
 BackupDesc=Chcete-li provést kompletní zálohu Dolibarr, musíte:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Doplňkové atributy (objednávka linky)
 ExtraFieldsSupplierInvoicesLines=Doplňkové atributy (linky faktura)
 ExtraFieldsThirdParties=Doplňkové atributy (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Doplňkové atributy (člen)
 ExtraFieldsMemberType=Doplňkové atributy (člen typ)
 ExtraFieldsCustomerInvoices=Doplňkové atributy (faktury)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Seznam oznámení na uživatele *
 ListOfNotificationsPerUserOrContact=Seznam oznámení na jednoho uživatele * nebo na kontakt **
 ListOfFixedNotifications=Seznam pevných oznámení
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Přejít na záložku „Oznámení“ třetí strany přidat nebo odebrat oznámení pro kontakty / adresy
 Threshold=Práh
 BackupDumpWizard=Průvodce vybudovat záložní databázi soubor s výpisem
 SomethingMakeInstallFromWebNotPossible=Instalace externího modulu není možné z webového rozhraní z tohoto důvodu:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Konfigurace modulu Zdroje
 UseSearchToSelectResource=Použijte vyhledávací formulář k výběru zdroje (spíše než rozevírací seznam).
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 4137ec59e87..77ec65489cf 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -7,7 +7,7 @@ BankName=Název banky
 FinancialAccount=Účet
 BankAccount=Bankovní účet
 BankAccounts=Bankovní účty
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Ukázat účet
 AccountRef=Finanční účet ref
 AccountLabel=Štítek finančního účtu
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Účetní adresa
 BankAccountCountry=Účet země
 BankAccountOwner=Název majitele účtu
 BankAccountOwnerAddress=Adresa majitele účtu
-RIBControlError=Kontrola integrity hodnot selhala. To znamená, že informace v tomto čísle účtu nejsou úplné nebo špatné (Zkontrolujte zemi, čísla a IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Vytvořit účet
 NewBankAccount=Nový účet
 NewFinancialAccount=Nový finanční účet
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Může být porovnáno
 Conciliate=Porovnat
 Conciliation=Porovnání
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Zahrnout uzavřené účty
 OnlyOpenedAccount=Pouze otevřené účty
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankovní převod
 BankTransfers=Bankovní převody
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Převod z <b>%s</b> na <b>%s</b> %s <b>%s</b> byl zaznamenán.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovní šeky
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Zobrazit příjmový vklad šeku
-NumberOfCheques=Nb šeky
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Zpět na účet
 ShowAllAccounts=Zobrazit pro všechny účty
-FutureTransaction=Transakce v budoucnosti.  Žádný způsob, jak porovnat.
-SelectChequeTransactionAndGenerate=Výběr/filtr kontrol zahrnujících příjem šekových vkladů, a klikněte na "Vytvořit".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Vyberte si výpis z účtu v souvislosti s porovnáváním. Použijte tříditelnou číselnou hodnotu: YYYYMM nebo YYYYMMDD
 EventualyAddCategory=Eventuelně upřesněte kategorii, ve které chcete klasifikovat záznamy
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 0f36ffaeb7b..09be777bf24 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> je obraz skutečné faktury, ale nemá účetní hodnotu.
 InvoiceReplacement=Náhradní faktura
 InvoiceReplacementAsk=Náhradní faktura faktury
-InvoiceReplacementDesc=<b>Náhradní faktura</b> se používá ke zrušení a nahrazení neuhrazené a vrácené faktury. <br><br> Poznámka: Pouze neuhrazená faktura může být nahrazena. Pokud není uzavřena, bude automaticky nastavena jako  'opuštěná '.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Dobropis
 InvoiceAvoirAsk=Opravit fakturu na dobropis
-InvoiceAvoirDesc=<b>Dobropis</b> je negativní faktura řešící skutečnost, že na původní faktuře je částka, které se liší od částky skutečně vyplacené. (zákazník zaplatil více omylem, nebo nezaplatil vše, protože například vrátil některé produkty).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Vytvořit dobropis s linkami od počátku faktury
 invoiceAvoirWithPaymentRestAmount=Vytvořit dobropis se zbývající neuhrazenou původní fakturou
 invoiceAvoirLineWithPaymentRestAmount=Dobropis na zbývající nezaplacené částky
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=V faktur měně
 PaidBack=Navrácené
 DeletePayment=Odstranit platby
 ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
-ConfirmConvertToReduc=Chcete převést tento %s do absolutního slevou? <br> částka bude tak možné uložit mezi všemi slevy a mohl by být použit jako sleva na současný nebo budoucí faktury pro tohoto zákazníka.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Platby dodavatelům
 ReceivedPayments=Přijaté platby
 ReceivedCustomersPayments=Platby přijaté od zákazníků
-PayedSuppliersPayments=Platby uhrazené dodavatelům
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Ověřené přijaté platby od zákazníků
 PaymentsReportsForYear=Zprávy o platbách pro %s
 PaymentsReports=Zprávy o platbách
@@ -91,8 +91,8 @@ PaymentConditionsShort=Platební podmínky
 PaymentAmount=Částka platby
 ValidatePayment=Ověření platby
 PaymentHigherThanReminderToPay=Platba vyšší než upomínka k zaplacení
-HelpPaymentHigherThanReminderToPay=Pozor, výše platby z jednoho nebo více účtů je vyšší než v zůstatku. <br> Upravte položky nebo potvrďte a připravte vytvoření dobropisu přeplatku přijatého pro každou fakturu.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikace 'Zaplaceno'
 ClassifyPaidPartially=Klasifikace 'Částečně uhrazeno'
 ClassifyCanceled=Klasifikace 'Opuštěné'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Uzavřeno (neuhrazené)
 BillStatusClosedPaidPartially=Placeno (částečně)
 BillShortStatusDraft=Návrh
 BillShortStatusPaid=Placeno
-BillShortStatusPaidBackOrConverted=Vrácení nebo převedeny
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Placeno
 BillShortStatusCanceled=Opuštěno
 BillShortStatusValidated=Ověřeno
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=nevrací
 BillShortStatusClosedUnpaid=Zavřeno
 BillShortStatusClosedPaidPartially=Placeno (částečně)
 PaymentStatusToValidShort=Chcete-li ověřit
-ErrorVATIntraNotConfigured=Intracommunautary DIČ zatím není definováno
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Není definován žádný výchozí platební režim. Přejděte do modulu nastavení faktur a opravte to.
 ErrorCreateBankAccount=Vytvořte si bankovní účet a pak přejděte do modulu nastavení faktur a nadefinujte platební režimy
 ErrorBillNotFound=Faktura %s neexistuje
-ErrorInvoiceAlreadyReplaced=Chyba při pokusu o ověření faktury a nahrazení fakturou %s. Ta byla již nahrazena fakturou %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Chyba, sleva byla již použita
 ErrorInvoiceAvoirMustBeNegative=Chyba, správná faktura musí mít zápornou částku
 ErrorInvoiceOfThisTypeMustBePositive=Chyba, tento typ faktury musí mít kladnou částku
 ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nelze zrušit, pokud faktura, která byla nahrazena jinou fakturu je stále ve stavu návrhu
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akce na faktuře
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Jste si jisti, že chcete změnit fakturu <b>%s</b> do s
 ConfirmCancelBill=Jste si jisti, že chcete zrušit fakturu <b>%s?</b>
 ConfirmCancelBillQuestion=Proč chcete klasifikovat fakturu jako 'opuštěnou' ?
 ConfirmClassifyPaidPartially=Jste si jisti, že chcete změnit fakturu <b>%s</b> do stavu uhrazeno?
-ConfirmClassifyPaidPartiallyQuestion=Tato faktura nebyla zaplacena úplně. Z jakých důvodů chcete uzavřít tuto fakturu?
-ConfirmClassifyPaidPartiallyReasonAvoir=Zbývající neuhrazené <b>(%s %s),</b> je poskytnutá sleva, protože platba byla provedena před termínem splatnosti. Opravte částku DPH  dobropisem.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zbývající neuhrazené <b>(%s %s),</b> je poskytnutá sleva, protože platba byla provedena před termínem splatnosti. Souhlasím se ztrátou DPH z této slevy.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Zbývající neuhrazené <b>(%s %s),</b> je poskytnutá sleva, protože platba byla provedena před termínem splatnosti. Vrátím zpět DPH na této slevě bez dobropisu
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Špatný zákazník
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty částečně vrácené
 ConfirmClassifyPaidPartiallyReasonOther=Částka opuštěná jiného důvodu
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Tato volba je možná, pokud faktura byla opatřena vhodným komentářem. (Příklad: "Pouze daň odpovídající ceně, která byla skutečně zaplacena dává práva na odpočet")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=V některých zemích je tato volba možná pouze tehdy, pokud faktura obsahuje správnou poznámku.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Použijte tuto volbu, pokud všechny ostatní volby nelze použít
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Špatný zákazník</b> je zákazník, který odmítá zaplatit svůj dluh.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Tato volba se používá když platba není kompletní, protože některé z výrobků byly vráceny
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Použijte tuto volbu, pokud se všechny ostatní nehodí, například v následujících situacích: <br> - Platba není kompletní, protože některé výrobky byly vráceny <br> - Nárokovaná částka je příliš důležitá, protože sleva nebyla uplatněna <br> Ve všech případech, kdy se částka liší od nárokované, musí být provedena oprava v systému evidence vytvořením dobropisu.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Ostatní
 ConfirmClassifyAbandonReasonOtherDesc=Tato volba se používá ve všech ostatních případech. Například proto, že máte v plánu vytvořit nahrazující fakturu.
 ConfirmCustomerPayment=Potvrdíte tento vstup platby pro <b> %s </ b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Potvrdíte tento vstup platby pro <b> %s </ b> %s?
 ConfirmValidatePayment=Jste si jisti, že chcete ověřit tuto platbu? Po ověření platby už nebudete moci provést žádnou změnu.
 ValidateBill=Ověřit fakturu
 UnvalidateBill=Neověřit fakturu
-NumberOfBills=Nb faktur
-NumberOfBillsByMonth=Nb faktury měsíce
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Částka faktur
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Čýstka faktur měsíčně (bez daně)
 ShowSocialContribution=Ukázat společenský / fiskální daň
 ShowBill=Zobrazit fakturu
@@ -260,9 +262,9 @@ Repeatables=Šablony
 ChangeIntoRepeatableInvoice=Převést do šablony faktury
 CreateRepeatableInvoice=Vytvořit šablonu faktury
 CreateFromRepeatableInvoice=Vytvořit ze šablony faktury
-CustomersInvoicesAndInvoiceLines=Zákaznické faktury a linky faktur
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Zákaznické faktury a platby
-ExportDataset_invoice_1=Zákaznické faktury a seznam linek faktur
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Zákaznické faktury a platby
 ProformaBill=Proforma účet:
 Reduction=Snížení
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Účetní adresa
-HelpEscompte=Tato sleva je sleva poskytnuta zákazníkovi, protože jeho platba byla provedena před termínem splatnosti.
-HelpAbandonBadCustomer=Tato částka byla opuštěna (zákazník řekl, aby byl špatný zákazník) a je považována za výjimečně volnou.
-HelpAbandonOther=Tato částka byla opuštěna, protože došlo k chybě (například špatný zákazník nebo faktura nahrazena jinou)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Sociální / fiskální odvod id
 PaymentId=ID platby
 PaymentRef=Platba ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Není vybrána žádná faktura
 CloneInvoice=Kopírovat fakturu
 ConfirmCloneInvoice=Jste si jisti, že chcete kopírovat tuto fakturu <b> %s </ b>?
 DisabledBecauseReplacedInvoice=Akce zakázána, protože faktura byla nahrazena
-DescTaxAndDividendsArea=Tato oblast představuje souhrn všech plateb za zvláštní výdaje. Nahrávat pouze s platbou v průběhu stanoveného období jsou zde zahrnuty.
-NbOfPayments=Nějaké platby
+DescTaxAndDividendsArea=Tato oblast představuje souhrn všech plateb za zvláštní výdaje. Zde jsou zahrnuty pouze záznamy s platbou v průběhu účetního roku.
+NbOfPayments=No. of payments
 SplitDiscount=Rozdělit slevu na dvě
-ConfirmSplitDiscount=Jste si jisti, že chcete rozdělit tuto slevu ve výši <b> %s </ b> %s do 2 nižších slev?
-TypeAmountOfEachNewDiscount=Vstupní hodnota pro každou ze dvou částí:
-TotalOfTwoDiscountMustEqualsOriginal=Celkem dvě nové slevy musí být rovny původní částce slevy.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Jste si jisti, že chcete odstranit tuto slevu?
 RelatedBill=Související faktura
 RelatedBills=Související faktury
 RelatedCustomerInvoices=Související faktury zákazníka
 RelatedSupplierInvoices=Související faktury dodavatele
 LatestRelatedBill=Nejnovější související faktura
-WarningBillExist=Varování, jedna nebo více faktur již existují
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Nástroj pro spojení PDF
 AmountPaymentDistributedOnInvoice=Výše platby distribuován na faktuře
-PaymentOnDifferentThirdBills=Povolit platby na různých subjektů účty, ale stejnou mateřskou společností
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=platba poznámka
 ListOfPreviousSituationInvoices=Seznam předchozí situace faktur
 ListOfNextSituationInvoices=Seznam dalších situace faktur
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Kontrola
 PaymentTypeShortCHQ=Kontrola
 PaymentTypeTIP=TIP (Documents za úplatu)
 PaymentTypeShortTIP=TIP Platba
-PaymentTypeVAD=On line platba
-PaymentTypeShortVAD=On line platby
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=šek
 PaymentTypeShortTRA=Návrh
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Bankovní spojení
 BankCode=Kód banky
-DeskCode=Desk kód
+DeskCode=Office code
 BankAccountNumber=Číslo účtu
-BankAccountNumberKey=Klíč
+BankAccountNumberKey=Check digits
 Residence=Inkaso
-IBANNumber=IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT číslo
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Platba převodem na bankovní účet
 VATIsNotUsedForInvoice=* Nepoužije DPH art-293B CGI
 LawApplicationPart1=Návrhem zákona 80,335 z 12.05.80
 LawApplicationPart2=Zboží zůstává majetkem
-LawApplicationPart3=prodávajícího až do úplného zaplacení
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=jejich cena.
 LimitedLiabilityCompanyCapital=SARL s kapitálem
 UseLine=Aplikovat
@@ -463,7 +465,7 @@ Cheques=Kontroly
 DepositId=id vklad
 NbCheque=Počet kontrol
 CreditNoteConvertedIntoDiscount=Tento %s byl převeden na %s
-UsBillingContactAsIncoiveRecipientIfExist=Použijte zákaznickou fakturační kontaktní adresu namísto adresy třetích stran jako příjemce pro faktury
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Zobrazit všechny neuhrazené faktury
 ShowUnpaidLateOnly=Zobrazit jen pozdní neuhrazené faktury
 PaymentInvoiceRef=Platba faktury %s
@@ -474,21 +476,22 @@ Reported=Zpožděný
 DisabledBecausePayments=Není možné, protože jsou zde některé platby
 CantRemovePaymentWithOneInvoicePaid=Nelze odstranit platbu protože je k dispozici alespoň jedna faktura označená jako zaplacená
 ExpectedToPay=Očekávaná platba
-CantRemoveConciliatedPayment=Není možné odstranit smířil platby
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Uhrazeno touto platbou
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Označit jako "Placeno" všechny dobropisy zcela splaceny.
-ClosePaidContributionsAutomatically=Klasifikovat „Paid“ všechny sociální nebo fiskální příspěvky v plné výši.
-AllCompletelyPayedInvoiceWillBeClosed=Všechny faktury s žádnými dalšími platbami bude automaticky uzavřeny ve stavu "Placené".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Zaplatit
 ToMakePaymentBack=Vrátit
 ListOfYourUnpaidInvoices=Seznam nezaplacených faktur
 NoteListOfYourUnpaidInvoices=Poznámka: Tento seznam obsahuje pouze faktury pro třetí strany které jsou propojeny na obchodního zástupce.
 RevenueStamp=Kolek
-YouMustCreateInvoiceFromThird=Tato možnost je dostupná pouze při vytváření faktury ze záložky "zákazníka" z subjektu
-YouMustCreateInvoiceFromSupplierThird=Tato možnost je k dispozici pouze při vytváření faktury na kartě „dodavatele“ subjektu
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Musíte nejprve vytvořit standardní fakturu a převést ji do „šablony“ pro vytvoření nové šablony faktury
 PDFCrabeDescription= PDF šablona faktur Crabe. Kompletní šablona faktury (doporučená šablona)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Faktura PDF šablony Crevette. Kompletní fakturu šablona pro situace faktur
 TerreNumRefModelDesc1=Vrátí číslo ve formátu %s yymm-nnnn pro standardní faktury a %s yymm-nnnn pro dobropisy, kde yy je rok, mm je měsíc a nnnn je sekvence bez přerušení a bez návratu k 0
 MarsNumRefModelDesc1=Vrátí číslo s formát %syymm-nnnn pro standardní faktury, %syymm-nnnn náhradních faktur, %syymm-nnnn pro akontace faktur a %syymm-nnnn pro dobropisy, kde yy je rok, MM měsíc a nnnn je sekvence bez přestávky a ne vrátí do polohy 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Faktura pokrok linka nemůže být větší než nebo r
 updatePriceNextInvoiceErrorUpdateline=Chyba: aktualizace cen na faktuře řádku: %s
 ToCreateARecurringInvoice=Chcete-li vytvořit opakující faktury pro tuto smlouvu, nejprve vytvořit tento návrh fakturu, pak převést jej do šablony faktury a definovat frekvenci pro generování budoucích fakturách.
 ToCreateARecurringInvoiceGene=S cílem vytvořit budoucí faktury pravidelně ručně, stačí jít nabídce <strong> %s - %s - %s </ strong>.
-ToCreateARecurringInvoiceGeneAuto=Potřebujete-li mít takové faktury generované automaticky, zeptejte se svého správce povolit a instalační modul <strong> %s </ strong>. Všimněte si, že obě metody (manuální a automatické) mohou být použity společně s žádným rizikem duplikace.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Odstranit šablonu faktury
 ConfirmDeleteRepeatableInvoice=Jsou vaše jisti, že chcete smazat šablonu faktury?
 CreateOneBillByThird=Vytvořte jednu fakturu za subjekt (jinak, jedna faktura na objednávku)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=faktura smazána
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index 58974243786..9799ffc6459 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Zobrazit společnost
 ShowStock=Zobrazit skladiště
 DeleteArticle=Klepnutím odeberete tento článek
 FilterRefOrLabelOrBC=Vyhledávání (Ref./Štítekl)
-UserNeedPermissionToEditStockToUsePos=Ptáte se na snížení zásoby na vytvořené faktuře, ale uživatel, který používá POS musí mít oprávnění k úpravám zásob.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Prodejní místa
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
index 95d6bff2b0e..122411355f2 100644
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonní hovor
 ActionAC_FAX=Odeslat fax
 ActionAC_PROP=Poslat e-mailem návrh
 ActionAC_EMAIL=Odeslat e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Schůze
 ActionAC_INT=Intervence na místě
 ActionAC_FAC=Poslat zákazníkovi fakturu poštou
@@ -72,8 +73,8 @@ StatusProsp=Stav cíle
 DraftPropals=Navrhnout obchodní návrhy
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/cs_CZ/dict.lang b/htdocs/langs/cs_CZ/dict.lang
index ef8e714862a..a3256701b6d 100644
--- a/htdocs/langs/cs_CZ/dict.lang
+++ b/htdocs/langs/cs_CZ/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heardův ostrov a McDonaldovy
 CountryVA=Vatikán (Svatý stolec)
 CountryHN=Honduras
 CountryHK=Hongkong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Indie
 CountryID=Indonésie
 CountryIR=Írán
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Severní Korea
 CountryKR=Jižní Korea
 CountryKW=Kuvajt
-CountryKG=Kyrgyzstán
+CountryKG=Kyrgyzstan
 CountryLA=Laos
 CountryLV=Lotyšsko
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavsko
 CountryMN=Mongolsko
 CountryMS=Monserrat
 CountryMZ=Mosambik
-CountryMM=Barma (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibie
 CountryNR=Nauru
 CountryNP=Nepál
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad a Tobago
 CountryTR=Turecko
 CountryTM=Turkmenistán
-CountryTC=Turks a Cailos ostrovy
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauricius rupie
 CurrencySingMUR=Mauricius rupie
 CurrencyNOK=Norské koruny
-CurrencySingNOK=Norská koruna
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuniských dinárů
 CurrencySingTND=Tuniský dinár
 CurrencyUSD=Dolary
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Dané slovo
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zaměstnanec
 DemandReasonTypeSRC_SPONSORING=Sponzoring
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formát 4A0
 PaperFormatEU2A0=Formát 2A0
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
index 364e8c97546..d180702cbee 100644
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Množství dokumentů v adresáři
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Adresář
 ECMSectionManual=Manuální adresář
 ECMSectionAuto=Automatický adresář
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenty související s projekty
 ECMDocsByUsers=Dokumenty spojené s uživateli
 ECMDocsByInterventions=Dokumenty spojené s intervencemi
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nevytvořený adresář
 ShowECMSection=Zobrazit adresář
 DeleteSection=Odstraňte adresář
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index b4e259803e0..c3b61105e57 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP klient se nezdařilo s chybou ‚%s‘
 ErrorGlobalVariableUpdater5=Žádné globální proměnná vybraná
 ErrorFieldMustBeANumeric=Pole <b> %s </ b> musí být číselná hodnota
 ErrorMandatoryParametersNotProvided=Povinné parametr (y) není k dispozici
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definice Array Menu V modulu popisovač (špatná hodnota za klíčový fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Heslo bylo nastaveno pro tohoto člena. Nicméně, žádný uživatelský účet byl vytvořen. Takže toto heslo uloženo, ale nemůže být použit pro přihlášení do Dolibarr. Může být použit externí modulu / rozhraní, ale pokud nepotřebujete definovat libovolné přihlašovací jméno ani heslo pro členem, můžete možnost vypnout „Správa přihlášení pro každého člena“ z nastavení člen modulu. Pokud potřebujete ke správě přihlášení, ale nepotřebují žádné heslo, můžete mít toto pole prázdné, aby se zabránilo toto upozornění. Poznámka: E-mail může být také použit jako přihlášení v případě, že člen je připojen k uživateli.
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
diff --git a/htdocs/langs/cs_CZ/help.lang b/htdocs/langs/cs_CZ/help.lang
index 4ed8ab1fd2a..b3a7854a279 100644
--- a/htdocs/langs/cs_CZ/help.lang
+++ b/htdocs/langs/cs_CZ/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real-time vzdálená podpora
 OtherSupport=Další podpora
 ToSeeListOfAvailableRessources=Pro kontaktování/zobrazení dostupných zdrojů:
 HelpCenter=Centrum nápovědy
-DolibarrHelpCenter=Centrum nápovědy a podpory Dolibarr
-ToGoBackToDolibarr=Jinak klikněte <a href="%s">zde pro použití Dolibarr</a>
-TypeOfSupport=Zdroj podpory
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Komunita (zdarma)
 TypeSupportCommercial=Obchodní
 TypeOfHelp=Typ
@@ -15,12 +15,9 @@ NeedHelpCenter=Potřebujete pomoc nebo podporu?
 Efficiency=Účinnost
 TypeHelpOnly=Pouze nápověda
 TypeHelpDev=Nápověda + Development
-TypeHelpDevForm=Nápověda + Development + Formace
-ToGetHelpGoOnSparkAngels1=Některé společnosti mohou poskytnout rychlou (někdy okamžitou) a efektivnější online podporu tím, že převezme kontrolu nad Vaším počítačem. Tyto pomocníky lze nalézt na internetových stránkách <b>%s:</b>
-ToGetHelpGoOnSparkAngels3=Můžete také přejít na seznam všech dostupných trenérů systému Dolibarr, kliknutím na tlačítko
-ToGetHelpGoOnSparkAngels2=Někdy není žádná společnost k dispozici v okamžiku Vašeho vyhledávání, popřemýšlejte tedy o změně Vašeho filtru na vyhledání "Všech dostupných". Budete mít možnost zaslat více požadavků.
-BackToHelpCenter=V opačném případě, klikněte <a href="%s"> zde pro skok zpět na domácí stránku help centra</a>.
-LinkToGoldMember=Můžete zavolat pouze jednomu z trenérů1 Dolibarru kliknutím na jeho Widget (stav a maximální cena automaticky aktualizována):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Podporované jazyky
-SubscribeToFoundation=Pomozte projektu Dolibarr přihlášením do nadace
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Pro oficiální support Dolibarru ve Vaší zemi: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index c6ddaa398a5..91e1d72c0d0 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Dovolená
-CPTitreMenu=Dovolená
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Měsíční výkaz
 MenuAddCP=New leave request
-NotActiveModCP=Musíte povolit modul dovolená pro zobrazení této stránky.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Požádejte o dovolenou
 DateDebCP=Datum zahájení
 DateFinCP=Datum ukončení
@@ -15,13 +15,18 @@ ApprovedCP=Schválený
 CancelCP=Zrušený
 RefuseCP=Odmínutý
 ValidatorCP=Schválil
-ListeCP=Seznam dovolených
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Bude přezkoumána
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Popis
 SendRequestCP=Vytvořit požadavek na dovolenou
 DelayToRequestCP=Požadavek na dovolenou musí být zadán nejméně <b>%s den(y)</b> před termínem.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Zbývající dovolená je <b>%s</b> dnů.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Musíte vybrat koncové datum větší než datum zahájení.
 ErrorSQLCreateCP=SQL chyba při tvorbě:
 ErrorIDFicheCP=Došlo k chybě, požadavek dovolené neexistuje.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Nemáte oprávnění číst tuto žádost o dovolenou
 InfosWorkflowCP=Průběh informací
 RequestByCP=Požádané
 TitreRequestCP=Nechat žádost
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Počet dní vyčerpané dovolené
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Upravit
 DeleteCP=Vymazat
 ActionRefuseCP=Odmítnout
@@ -59,6 +71,7 @@ DateRefusCP=Datum odmítnutí
 DateCancelCP=Datum zrušení
 DefineEventUserCP=Přiřadit výjimečnou dovolenou pro uživatele
 addEventToUserCP=Přiřadit dovolenou
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Důvod
 UserCP=Uživatel
 ErrorAddEventToUserCP=Došlo k chybě při přidávání požadavku na výjimečnou dovolenou.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Aktualizováno úspěšně.
 Module27130Name= Správa žádostí o dovolenou
 Module27130Desc= Správa požadavků dovolené
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Ověření žádosti o dovolenou
 HolidaysToValidateBody=Níže je požadavek na ověření dovolené
 HolidaysToValidateDelay=Tento požadavek dovolené proběhne ve lhůtě kratší než %s dní.
-HolidaysToValidateAlertSolde=Uživatel, který vytvořil tento požadavek na dovolenou nemá k dispozici dostatek dní.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Ověřené žádosti dovolené
 HolidaysValidatedBody=Vaše žádost o dovolenou %s do %s byla ověřena.
 HolidaysRefused=Požadavek zamítnut
@@ -103,4 +121,9 @@ HolidaysCanceled=Zrušené požadavky na dovolenou
 HolidaysCanceledBody=Vaše žádost o dovolenou pro %s na %s byla zrušena.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 0b57a2b96c9..65c9d87cb6a 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Stačí sledovat instrukce krok za krokem.
 MiscellaneousChecks=Kontrola prerekvizit
 ConfFileExists=Konfigurační soubor <b>%s</b> existuje.
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> Konfigurační soubor neexistuje a nemohl být vytvořen!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=<b>%s</b> Konfigurační soubor byl vytvořen.
-ConfFileIsNotWritable=Konfigurační soubor <b>%s</b> není zapisovatelný. Zkontrolujte oprávnění. Při první instalaci musí mít Váš server právo zápisu do tohoto souboru.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfigurační soubor <b>%s</b> je zapisovatelný.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Aktualizuj všechny informace z konfiguračního souboru.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Tato PHP instalace podporuje relace.
 PHPSupportPOSTGETOk=Tato PHP instalace podporuje proměnné POST a GET.
-PHPSupportPOSTGETKo=Je možné, že vaše instalace PHP nepodporuje proměnné POST a/nebo GET. Zkontrolujte parametr <b>variables_order</b> ve Vašem php.ini.
-PHPSupportGD=Tato PHP instalace podporuje GD grafické funkce.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Tato PHP instalace podporuje UTF8 funkce.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Maximální velikost relace je nastavena na <b>%s.</b> To by mělo stačit.
-PHPMemoryTooLow=Maximální velikost relace je nastavena na <b>%s</b> bajtů. To bohužel nestačí. Zvyšte svůj parametr <b>memory_limit</b> ve Vašem <b>php.ini</b> na minimální velikost <b>%s</b> bajtů.
-Recheck=Klikněte zde pro více vypovídající test
-ErrorPHPDoesNotSupportSessions=Vaše PHP instalace nepodporuje relace. Tato funkce je nutná, pro správnou funkčnost Dolibarr. Zkontrolujte Vaše PHP nastavení.
-ErrorPHPDoesNotSupportGD=Tato PHP instalace nepodporuje GD grafické funkce. Žádný graf nebude k dispozici.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Tato PHP instalace nepodporuje UTF8 funkce. Tato funkce je nutná, pro správnou funkčnost Dolibarr. Zkontrolujte Vaše PHP nastavení.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Adresář %s neexistuje.
-ErrorGoBackAndCorrectParameters=Jděte zpět a opravte špatné parametry.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Možná jste zadali nesprávnou hodnotu pro parametr '%s'.
 ErrorFailedToCreateDatabase=Nepodařilo se vytvořit databázi '%s'.
 ErrorFailedToConnectToDatabase=Nepodařilo se připojit k databázi '%s'.
 ErrorDatabaseVersionTooLow=Verze databáze (%s) je příliš stará a vetchá. Je potřeba omladit na verzi databáze alespoň %s.
 ErrorPHPVersionTooLow=Tato verze PHP je příliš stará. Verze %s je potřeba.
-ErrorConnectedButDatabaseNotFound=Připojení k serveru bylo úspěšné, ale databáze '%s' nebyla nalezena.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Databáze '%s' již existuje.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Pokud databáze neexistuje, vraťte se zpět a zaškrtněte volbu "Vytvořit databázi".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Pokud databáze již existuje, vraťte se zpět a zrušte zaškrtnutí políčka "Vytvořit databázi".
-WarningBrowserTooOld=Verze Vašeho prohlížeče je příliš stará. Silně doporučujeme aktualizovat na nejnovější verzi Firefox, Chrome nebo Opery.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP verze
 License=Používá licenci
 ConfigurationFile=Konfigurační soubor
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr databáze
 DatabaseType=Typ databáze
 DriverType=Typ ovladače
 Server=Server
-ServerAddressDescription=Jméno nebo IP adresa databázového serveru, obvykle 'localhost', když je databázový server umístěn na stejném serveru jako web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Port databázového serveru. Ponechte prázdné, pokud jej neznáte.
 DatabaseServer=Databázový server
 DatabaseName=Název databáze
-DatabasePrefix=Prefix tabulek v databázi
-AdminLogin=Přihlášení pro vlastníka databáze Dolibarr.
-PasswordAgain=Heslo znovu
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Heslo pro vlastníka databáze Dolibarr.
 CreateDatabase=Vytvořit databázi
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Databázový server - přístup Superuser
-CheckToCreateDatabase=Zaškrtněte, pokud databáze neexistuje a musí být vytvořena. <br> V takovém případě budete muset zadat přihlašovací jméno / heslo pro superuživatele účtu v dolní části stránky.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Přihlášení uživatele oprávněného vytvářet nové databáze nebo nové uživatele, povinné, pokud vaše databáze nebo její majitel doposud neexistuje.
-KeepEmptyIfNoPassword=Ponechte prázdné, pokud uživatel nemá heslo (nedoporučeno)
-SaveConfigurationFile=Uložit hodnoty
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Připojení k serveru
 DatabaseCreation=Vytvoření databáze
 CreateDatabaseObjects=Tvorba databázových objektů
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Vytvořit cizí klíče a indexy pro tabulku %s
 OtherKeysCreation=Cizí klíče a tvorba indexů
 FunctionsCreation=Vytváření funkcí
 AdminAccountCreation=Vytváření přístupových údajů administrátora
-PleaseTypePassword=Prosím zadejte heslo, prázdné heslo není dovoleno!
-PleaseTypeALogin=Prosím zadejte přihlašovací údaje!
-PasswordsMismatch=Hesla se liší, zkuste to znovu!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Konec nastavení
 SystemIsInstalled=Tato instalace je dokončena.
 SystemIsUpgraded=Dolibarr byl úspěšně aktualizován.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Je třeba nastavit Dolibarr aby vyhovoval vašim potř
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Přejít na Dolibarr
 GoToSetupArea=Přejít na Dolibarr (Oblast Nastavení)
-MigrationNotFinished=Verze Vaší databáze není zcela aktuální, budete muset spustit aktualizaci znovu.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Přejít znovu na aktualizační stránku
 WithNoSlashAtTheEnd=Bez lomítka "/" na konci
-DirectoryRecommendation=Je doporučeno použít adresář mimo adresáře webových stránek.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Již existuje
 DolibarrAdminLogin=Login Dolibarr administrátora
-AdminLoginAlreadyExists=Účet administrátora Dolibarru '<b>%s</b>' již existuje. Běžte zpět, pro vytvoření jiného.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Pozor, z bezpečnostních důvodů po dokončení instalace či upgradu je potřeba zabránit opětovnému spuštění instalace. Přidejte soubor s názvem <b>install.lock</b> do adresáře document Dolibarr, aby jste zabránili nebezpečnému spuštění.
-FunctionNotAvailableInThisPHP=Není k dispozici na této instalaci PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Vyberte migrační skript
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skript běží
 ChooseYourSetupMode=Vyberte si režim instalace a klepněte na tlačítko "Start"...
 FreshInstall=Nová instalace
-FreshInstallDesc=Tento režim použijte, pokud je to vaše první instalace. Pokud ne, můžete v tomto režimu opravit neúplnou předchozí instalaci. Pokud chcete upgradovat Vaší verzi, vyberte režim "Aktualizace"
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Aktualizace
 UpgradeDesc=Tento režim použijte, pokud jste přepsali staré Dolibarr soubory novějšími. Tím dojde k aktualizace databáze a dat.
 Start=Start
 InstallNotAllowed=Instalace není povolena oprávněním <b>conf.php</b>
 YouMustCreateWithPermission=Vytvořte soubor %s a nastavte mu oprávnění k zápisu webovým serverem během instalace.
-CorrectProblemAndReloadPage=Opravte problém a stiskněte klávesu F5 pro obnovení stránky.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Už migrováno
 DatabaseVersion=Verze databáze
 ServerVersion=Verze databázového serveru
 YouMustCreateItAndAllowServerToWrite=Vytvořte tento adresář a nastavte mu oprávnění k zápisu webovým serverem během instalace.
 DBSortingCollation=Způsob řazení
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Pro Váš dotaz vytvoření databáze <b>%s,</b> se musí Dolibarr připojit k serveru <b>%s</b> s oprávněním super-usera <b>%s.</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=Pro Váš dotaz vytvoření databázového loginu <b>%s,</b> se musí Dolibarr připojit k serveru <b>%s</b> s oprávněním super-usera <b>%s.</b>
-BecauseConnectionFailedParametersMayBeWrong=Jelikož se připojení nezdařilo, parametry host či super-user jsou zadány chybně.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Oprhans-platba detekována metodou %s
 RemoveItManuallyAndPressF5ToContinue=Odstraňte ručně a pokračujte stisknutím klávesy F5.
 FieldRenamed=Pole přejmenováno
-IfLoginDoesNotExistsCheckCreateUser=Pokud login doposud neexistuje, je potřeba zašktrnout volbu "Vytvořit uživatele"
-ErrorConnection=Server "<b>%s</b>", název databáze "<b>%s</b>", login "<b>%s</b>" nebo heslo databáze je uvedeno špatně, případně verze PHP klienta může být příliš stará oproti verzi databáze.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Doporučená instalace verze <b>%s</b> z Vaší verze <b>%s</b>
 InstallChoiceSuggested=<b>Volba instalace navržená instalátorem</b>
-MigrateIsDoneStepByStep=Cílová verze (%s) má odskok mnoha verzí, takže průvodce instalací se po dokončení migrace vrátí s doporučením na odskok na další migraci.
-CheckThatDatabasenameIsCorrect=Zkontrolujte, zda název databáze "<b>%s</b>" je správný.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Pokud je toto správný název a databáze dosud neexistuje, zkontrolujte volbu "Vytvořit databázi".
 OpenBaseDir=PHP openbasedir parametr
-YouAskToCreateDatabaseSoRootRequired=Zaškrtli jste "Vytvořit databázi". Pro to je potřeba vyplnit login/heslo super-usera (vespod formuláře).
-YouAskToCreateDatabaseUserSoRootRequired=Zaškrtli jste "Vytvořit vlastníka databáze". Pro to je potřeba vyplnit login/heslo super-usera (vespod formuláře).
-NextStepMightLastALongTime=Aktuální krok může trvat několik minut. Před dalším pokračováním prosím počkejte na zobrazení další obrazovky.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrace přepravy úložiště zákaznických objednávek
 MigrationShippingDelivery=Aktualizace úložiště přepravy
 MigrationShippingDelivery2=Aktualizace úložiště přepravy 2
 MigrationFinished=Migrace dokončena
-LastStepDesc=<strong>Poslední krok:</strong> Definujte zde přihlašovací jméno a heslo které budete používat pro připojení k softwaru. Toto heslo neztraťte - jedná se o jediný administrátorský účet.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktivace modulu %s
 ShowEditTechnicalParameters=Klikněte zde pro zobrazení / editaci pokročilých parametrů (pro experty)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Vaše verze databáze  je %s. Ta bohužel obsahuje kritickou chybu mající zásadní vliv na ztrátu dat, pokud provedete změnu struktury ve vaší databázi, stejně jako je to vyžadováno v procesu migrace. Z tohoto důvodu nebude migrace povolena, dokud neprovedete upgrade databáze na vyšší fixní verzi (seznam známých chybných verzí: %s)
-KeepDefaultValuesWamp=Používáte instalaci Dolibarr pomocí DoliWamp, tedy tyto hodnoty jsou již optimalizované pro Váš stroj. Změňte je pouze tehdy, pokud víte přesně co děláte.
-KeepDefaultValuesDeb=Používáte instalaci Dolibarr z Linux-ového balíčku (Ubuntu, Debian, Fedora ...), takže tyto hodnoty jsou již optimalizovány pro Váš stroj. Vyplňte pouze heslo vlastníka databáze. Ostatní parametry měňte jen pokud skutečně víte co děláte.
-KeepDefaultValuesMamp=Používáte instalaci Dolibarr pomocí DoliMamp, takže tyto hodnoty jsou již optimalizovány pro Váš stroj. Parametry měňte jen pokud skutečně víte co děláte.
-KeepDefaultValuesProxmox=Používáte instalaci Dolibarr pomocí Proxmox, takže tyto hodnoty jsou již optimalizovány pro Váš stroj. Parametry měňte jen pokud skutečně víte co děláte.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrace dat komerčních návrhů
 MigrationInvoice=Migrace dat zákaznických faktur
 MigrationContract=Migrace dat smluv
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Aktualizace úspěšná
 MigrationUpdateFailed=Proces aktualizace selhal
 MigrationRelationshipTables=Migrace dat relačního schématu tabulek (%s)
 MigrationPaymentsUpdate=Oprava platebních dat
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Oprava smluvních dat
 MigrationContractsNumberToUpdate=%s smlouva(y) k aktualizaci
 MigrationContractsLineCreation=Vytvořte řádky pro smlouvu %s
 MigrationContractsNothingToUpdate=Žádné další úkoly
-MigrationContractsFieldDontExist=Pole fk_facture už neexistuje. Žádné další úkoly.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Oprava prázdného data smlouvy
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Žádné prázdné datum smlouvy k opravě
 MigrationContractsEmptyCreationDatesNothingToUpdate=Žádné prázdné smluvní datum k opravě
 MigrationContractsInvalidDatesUpdate=Oprava chybné hodnoty data smlouvy
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Aktualizace příjmu
 MigrationStockDetail=Aktualizace stavu zásob produktu
 MigrationMenusDetail=Aktualizace dynamických menu tabulky
 MigrationDeliveryAddress=Aktualizovat doručovací adresu nákladů
-MigrationProjectTaskActors=Migrace dat tabulky llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migrace dat pole fk_user_resp llx_projet na llx_element_contact
 MigrationProjectTaskTime=Čas aktualizace v sekundách
 MigrationActioncommElement=Aktualizovat údaje na činnostech
 MigrationPaymentMode=Migrace dat platebního režimu
 MigrationCategorieAssociation=Migrace kategorií
-MigrationEvents=Migrace událostí přidá vlastníka události do přiřazené tabulky
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Načíst modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Ukázat nedostupné možnosti
-HideNotAvailableOptions=Skrýt nedostupné možnosti
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 951173edd8c..d17e43e482e 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakty pro tuto třetí stranu
 ContactsAddressesForCompany=Kontakty/adresy pro tuto třetí stranu
 AddressesForCompany=Adresy pro tuto třetí stranu
 ActionsOnCompany=Akce u této třetí strany
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Akce u tohoto uživatele
 ActionsOnProduct=Events about this product
 NActionsLate=%s pozdě
@@ -847,9 +848,9 @@ ModuleBuilder=module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Hromadné akce
 ClickToShowHelp=Click to show tooltip help
-WebSite=Webová stránka
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Webové stránky
+WebSiteAccounts=Website accounts
 ExpenseReport=Zpráva výdaje
 ExpenseReports=Zpráva výdajů
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index c6cb236ce9d..e2c32ee9e0f 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Propojený objekt
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Nastavení webových stránek modulu
 WEBSITE_PAGEURL=URL stránky
 WEBSITE_TITLE=Titul
 WEBSITE_DESCRIPTION=Popis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Klíčová slova
 LinesToImport=Lines to import
diff --git a/htdocs/langs/cs_CZ/paybox.lang b/htdocs/langs/cs_CZ/paybox.lang
index af97270c3bd..a6da89f3606 100644
--- a/htdocs/langs/cs_CZ/paybox.lang
+++ b/htdocs/langs/cs_CZ/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Nastavení modulu PayBox
 PayBoxDesc=Tento modul nabízejí stránky, které umožní platby na <a href="http://www.paybox.com" target="_blank">Paybox</a> zákazníky. Toho lze využít pro volnou platbu nebo platbu na určitý objekt Dolibarr (faktury, objednávky, ...)
 FollowingUrlAreAvailableToMakePayments=Přes URL jsou k dispozici nabízené stránky, které zákazníkovi umožní provést platbu na Dolibarr objektech
 PaymentForm=Formulář platby
-WelcomeOnPaymentPage=Vítáme Vás na naší on-line platební službě
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Tato obrazovka vám umožní provést on-line platbu %s.
 ThisIsInformationOnPayment=Jsou zde informace o provedené platbě
 ToComplete=Chcete-li dokončit
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL nabízí %s on-line platební uživate
 ToOfferALinkForOnlinePaymentOnContractLine=URL nabízí %s on-line platební uživatelské rozhraní pro řádky smluv
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL nabízí %s on-line platební uživatelské rozhraní pro volnou částku
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL nabízí %s on-line platební uživatelské rozhraní pro členské předplatné
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Můžete také přidat parametr URL <b>&tag = <i>hodnota</i></b> na některou z těchto URL (nutné pouze pro volné platby) a přidat vlastní komentář platby.
-SetupPayBoxToHavePaymentCreatedAutomatically=Nastavte si PayBox s url <b>%s</b> pro možnost vytvoření automaticky při ověřeí Payboxu.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Tato stránka potvrzuje, že platba byla zaznamenána. Děkuju.
-YourPaymentHasNotBeenRecorded=Vaše platba nebyla zaznamenána a transakce byla zrušena. Děkuju.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametry účtu
 UsageParameter=Použité parametry
 InformationToFindParameters=Pomozte najít %s informace o účtu
diff --git a/htdocs/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
index 0160f9b3731..6d06197dbad 100644
--- a/htdocs/langs/cs_CZ/propal.lang
+++ b/htdocs/langs/cs_CZ/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Podpis (potřeba fakturace)
 PropalStatusNotSigned=Nejste přihlášen (uzavřený)
 PropalStatusBilled=Účtováno
 PropalStatusDraftShort=Návrh
-PropalStatusValidatedShort=Ověřeno
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zavřeno
 PropalStatusSignedShort=Podepsaný
 PropalStatusNotSignedShort=Nepodepsaný
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s nebyl nalezen
 AddToDraftProposals=Přidat do předlohy nabídky
 NoDraftProposals=Žádné návrhy nabídek
 CopyPropalFrom=Vytvořit obchodní nabídku zkopírováním existující nabídky
-CreateEmptyPropal=Vytvořte prázdnou obchodní nabídku z šablony nebo ze seznamu produktů/služeb
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Doba platnosti výchozí obchodní nabídky (ve dnech)
-UseCustomerContactAsPropalRecipientIfExist=Použití kontaktní adresy zákazníka, je-li definována místo třetí stranou jako adresa příjemce nabídky
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Kopírovat obchodní nabídku
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kontakt se zákazníkem pro následující
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Kompletní šablona nabídky (logo. ..)
+DocModelCyanDescription=Kompletní šablona nabídky (logo. ..)
 DefaultModelPropalCreate=Tvorba z výchozí šablony
 DefaultModelPropalToBill=Výchozí šablona při uzavírání obchodní nabídky (bude se fakturovat)
 DefaultModelPropalClosed=Výchozí šablona při uzavírání obchodní nabídky (nevyfakturované)
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index d5b6d19be42..e57e06906c9 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kód
-WebsiteSetupDesc=Vytvořte zde tolik vstupů jako množství různých webových stránek, které potřebujete. Pak přejděte do nabídky webové stránky na jejich editaci.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Odstranit web
-ConfirmDeleteWebsite=Jste si jisti, že chcete smazat tuto webovou stránku? Všechny stránky a obsah budou odstraněny.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Název stránky / alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL externího souboru CSS
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=knihovna multimédií
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Úprava menu
 EditMedias=Edit medias
-EditPageMeta=Editovat Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Ukázky vaše webové stránky <strong> %s </ strong> ještě nejsou k dispozici. Musíte nejprve přidat stránku.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=Zobrazit stránku v nové kartě
 SetAsHomePage=Nastavit jako domovskou stránku
 RealURL=real URL
 ViewWebsiteInProduction=Pohled webové stránky s použitím domácí adresy URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Číst
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 72830b92be8..a8e0ec00a0d 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funktionen slået fra i demo
 FeatureAvailableOnlyOnStable=Funktionen er kun tilgængelig på officielle stabile versioner
 BoxesDesc=Widgets er komponenter, der viser nogle oplysninger, som du kan tilføje for at tilpasse nogle sider. Du kan vælge mellem at vise widgeten eller ej ved at vælge målside og klikke på 'Aktiver' eller ved at klikke på papirkurven for at deaktivere den.
 OnlyActiveElementsAreShown=Kun elementer fra de <a href="%s">aktiverede moduler</a> er vist.
-ModulesDesc=Modulerne / applikationerne bestemmer hvilke funktioner der er tilgængelige i softwaren. Nogle moduler kræver tilladelser til brugere efter aktivering af modulet. Klik på tænd / sluk-knappen for at aktivere / deaktivere et modul / program.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Du kan finde flere moduler som kan downloades på eksterne hjemmesider på internettet ...
 ModulesDeployDesc=Hvis tilladelser i dit filsystem tillader det, kan du bruge dette værktøj til at installere et eksternt modul. Modulet vil så være synligt på fanen <strong> %s</strong>.
 ModulesMarketPlaces=Finde eksterne app/moduler
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-moduler værktøjer
 ModuleFamilyExperimental=Eksperimentel moduler
 ModuleFamilyFinancial=Finansielle moduler (regnskab/økonomi)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Websteder og anden frontal applikation
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Grænseflader med eksterne systemer
 MenuHandlers=Menu håndterer
 MenuAdmin=Rediger menuen
@@ -463,9 +463,9 @@ ClickToShowDescription=Klik for at vise beskrivelse
 DependsOn=Dette modul har brug for modulet / modulerne
 RequiredBy=Dette modul er påkrævet efter modul (er)
 TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Teknisk viden er nødvendig for at læse indholdet af HTML-siden for at få nøglenavnet på et felt.
-PageUrlForDefaultValues=Du skal indtaste den relative url på siden. Hvis du indbefatter parametre i URL, vil standardværdierne være effektive, hvis alle parametre er indstillet til samme værdi. Eksempler:
-PageUrlForDefaultValuesCreate=<br> For formular til oprettelse af en ny tredjepart er det <strong> %s </strong>, <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
-PageUrlForDefaultValuesList=<br> For side, der lister tredjeparter, er det <strong> %s </ strong>, <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </ strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Aktivér brug af personlige standardværdier
 EnableOverwriteTranslation=Aktivér brug af overskrevet oversættelse
 GoIntoTranslationMenuToChangeThis=Der er fundet en oversættelse for nøglen med denne kode. For at ændre denne værdi skal du redigere den fra Hjem-Indstillinger-oversættelse.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=Rotmappen, hvor alle filer uploades manuelt, når du br
 Module0Name=Brugere og grupper
 Module0Desc=Brugere / Medarbejdere og Grupper management
 Module1Name=Tredjeparter
-Module1Desc=Virksomheder og kontaktstyring (kunder, potentielle kunder ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Tilbud
 Module2Desc=Tilbudshåndtering
 Module10Name=Regnskab
@@ -501,7 +501,7 @@ Module23Desc=Overvågning af forbruget af energi
 Module25Name=Kundeordrer
 Module25Desc=Kundeordrestyring
 Module30Name=Fakturaer
-Module30Desc=Fakturaer og kreditnotaer 'forvaltning for kunderne. Faktura 'forvaltning for leverandører
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Leverandører
 Module40Desc=Leverandører og indkøbs styring (købsordrer og fakturering)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Momssatser
 DictionaryRevenueStamp=Skattefrihedsbeløb
 DictionaryPaymentConditions=Betalingsbetingelser
 DictionaryPaymentModes=Betalingsformer
-DictionaryTypeContact=Kontaktadressetyper
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type af hjemmesider/containere
 DictionaryEcotaxe=Miljøafgift (WEEE)
 DictionaryPaperFormat=Papir formater
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Lokale skatter rapporter er det samlede salg af localtaxes
 LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan findes for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etiket eller oversættelsestast
+ValueOfConstantKey=Value of constant
 NbOfDays=Antal dage
 AtEndOfMonth=Ved udgangen af måneden
 CurrentNext=Aktuel / Næste
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s"> %s -> %s </a> <br> Grundlæggende parametre, der
 SetupDescription4=<a href="%s"> %s -> %s </a> <br> Dolibarr ERP / CRM er en samling af mange moduler / applikationer, alle mere eller mindre uafhængige. Modulerne, der er relevante for dine behov, skal aktiveres og konfigureres. Nye emner / valgmuligheder tilføjes til menuer med aktivering af et modul.
 SetupDescription5=Andre opsætningsmenuposter indeholder valgfrie parametre.
 LogEvents=Sikkerhed revision arrangementer
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
 InfoOS=Om OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser navn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Liste over Dolibarr sikkerhed begivenheder
 SecurityEventsPurged=Sikkerhed begivenheder renset
-LogEventDesc=Du kan gøre det muligt at logge for Dolibarr sikkerhed begivenheder her. Administratorer kan derefter se dens indhold via menuen <b>Systemværktøjer - Revision.</b> Advarsel, denne funktion kan forbruge en stor mængde data i databasen.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b> administratorbrugere</b>.
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er til rådighed for administratoren brugere. Ingen af de Dolibarr permissions kan reducere denne grænse.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Trin for afrunding (i lande, hvor afrunding sker med base
 UnitPriceOfProduct=Netto enhedspris for en vare
 TotalPriceAfterRounding=Samlet pris (netto/moms/inkl. moms) efter afrunding
 ParameterActiveForNextInputOnly=Parameter effektive for næste input kun
-NoEventOrNoAuditSetup=Der er ikke registreret nogen sikkerhedshændelse endnu. Dette kan være normalt, hvis audit ikke er aktiveret på siden "setup - security - audit".
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=Der er ikke fundet nogen sikkerhedshændelse for disse søgekriterier.
 SeeLocalSendMailSetup=Se din lokale sendmail opsætning
 BackupDesc=Hvis du vil foretage en komplet sikkerhedskopi af Dolibarr, skal du:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Supplerende attributter (skabeloner faktura linjer)
 ExtraFieldsSupplierOrdersLines=Supplerende attributter (ordrelinjer)
 ExtraFieldsSupplierInvoicesLines=Supplerende attributter (faktura linjer)
 ExtraFieldsThirdParties=Supplerende attributter (tredjepart)
-ExtraFieldsContacts=Supplerende attributter (kontaktadresse)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Supplerende attributter (medlem)
 ExtraFieldsMemberType=Supplerende attributter (medlemstype)
 ExtraFieldsCustomerInvoices=Supplerende attributter (fakturaer)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Liste over meddelelser pr. Bruger *
 ListOfNotificationsPerUserOrContact=Liste over meddelelser pr. Bruger * eller pr. Kontakt **
 ListOfFixedNotifications=Liste over faste meddelelser
 GoOntoUserCardToAddMore=Gå til fanen "Notifikationer" for en bruger for at tilføje eller fjerne underretninger for brugere
-GoOntoContactCardToAddMore=Gå på fanen "Notifikationer" fra en tredjepart for at tilføje eller fjerne underretninger for kontaktadresser
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Grænseværdi
 BackupDumpWizard=Guiden til at opbygge database backup dump fil
 SomethingMakeInstallFromWebNotPossible=Installation af eksternt modul er ikke muligt fra webgrænsefladen af ​​følgende årsag:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Postnummer
 ##### Resource ####
 ResourceSetup=Konfiguration du modul Ressource
 UseSearchToSelectResource=Brug en søgeformular til at vælge en ressource (i stedet for en rullemenu).
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 61d883cc743..667f12de888 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank navn
 FinancialAccount=Konto
 BankAccount=Bankkonto
 BankAccounts=Bankkonti
-BankAccountsAndGateways=Bankkonti | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Vis konto
 AccountRef=Finansiel konto ref
 AccountLabel=Finansiel konto etiket
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Konto adresse
 BankAccountCountry=Konto land
 BankAccountOwner=Konto ejer navn
 BankAccountOwnerAddress=Konto ejer adresse
-RIBControlError=Integritetscheck af værdier fejler. Det betyder, at oplysninger til dette kontonummer ikke er fuldstændige eller forkerte (check land, numre og IBAN).
+RIBControlError=Integritetscheck af værdier fejler. Det betyder, at oplysningerne for dette kontonummer er ufuldstændige eller forkerte (tjek land, numre og IBAN).
 CreateAccount=Opret konto
 NewBankAccount=Ny konto
 NewFinancialAccount=Ny finansiel konto
@@ -76,6 +76,7 @@ TransactionsToConciliate=Linjer til afsteming
 Conciliable=Kan afstemmes
 Conciliate=Afstem
 Conciliation=Afstemning
+SaveStatementOnly=Gem kun udsagn
 ReconciliationLate=Afstemning sent
 IncludeClosedAccount=Inkluder lukkede konti
 OnlyOpenedAccount=Kun åbne konti
@@ -104,19 +105,19 @@ SocialContributionPayment=Social / skattemæssig skat betaling
 BankTransfer=bankoverførsel
 BankTransfers=Bankoverførsler
 MenuBankInternalTransfer=Intern overførsel
-TransferDesc=Overførsel fra en konto til en anden, vil Dolibarr skrive to poster (en debitering i kildekonto og en kredit i målkonto. Det samme beløb (undtagen tegn), etiket og dato vil blive brugt til denne transaktion)
+TransferDesc=Overførsel fra en konto til en anden, Dolibarr vil skrive to poster (en debitering i kildekonto og en kredit i målkonto). Det samme beløb (uden fortegn), etiket og dato vil blive brugt til denne transaktion)
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overførsel fra <b> %s </b> til <b> %s </b> af <b> %s </b> %s er blevet optaget.
 CheckTransmitter=Transmitter
 ValidateCheckReceipt=Bekræft denne kvitteringskvittering?
-ConfirmValidateCheckReceipt=Er du sikker på at du vil validere denne kvittering for kvittering, vil der ikke blive foretaget nogen ændring, når dette er gjort?
+ConfirmValidateCheckReceipt=Er du sikker på at du vil bekræfte denne kvittering for kvittering, vil der ikke blive foretaget nogen ændring, når dette er gjort?
 DeleteCheckReceipt=Slet denne kvittering for kvittering?
 ConfirmDeleteCheckReceipt=Er du sikker på, at du vil slette denne kvittering for kvittering?
 BankChecks=Bankcheck
 BankChecksToReceipt=Checks venter depositum
 ShowCheckReceipt=Vis check depositum kvittering
-NumberOfCheques=Nb af kontrol
+NumberOfCheques=Antal tjek
 DeleteTransaction=Slet indtastning
 ConfirmDeleteTransaction=Er du sikker på, at du vil slette denne post?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette genereret bankindtastning
@@ -135,7 +136,7 @@ BankTransactionLine=Bank post
 AllAccounts=Alle bank- og kontantekonti
 BackToAccount=Tilbage til konto
 ShowAllAccounts=Vis for alle konti
-FutureTransaction=Transaktion i fremtiden. Ingen måde at forligne.
+FutureTransaction=Transaktion i fremtiden. Ingen måde at forene.
 SelectChequeTransactionAndGenerate=Vælg / filtrer checks for at inkludere i kontokortet og klik på "Opret".
 InputReceiptNumber=Vælg kontoudskrift relateret til forliget. Brug en sorterbar numerisk værdi: ÅÅÅÅMM eller ÅÅÅÅMMDD
 EventualyAddCategory=Til sidst skal du angive en kategori, hvor klasserne skal klassificeres
@@ -153,7 +154,7 @@ RejectCheckDate=Dato checken blev returneret
 CheckRejected=Tjek tilbage
 CheckRejectedAndInvoicesReopened=Tjek tilbage, og fakturaer genåbnes
 BankAccountModelModule=Dokumentskabeloner til bankkonti
-DocumentModelSepaMandate=Skabelon af SEPA mandat. Nyttige til europæiske lande kun i EØF.
+DocumentModelSepaMandate=Skabelon af SEPA mandat. Nyttig til europæiske lande kun i EØF.
 DocumentModelBan=Skabelon til at udskrive en side med BAN-oplysninger.
 NewVariousPayment=Nye diverse betalinger
 VariousPayment=Diverse betalinger
@@ -162,4 +163,6 @@ ShowVariousPayment=Vis diverse betalinger
 AddVariousPayment=Tilføj diverse betalinger
 SEPAMandate=SEPA mandat
 YourSEPAMandate=Dit SEPA mandat
-FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Takket være returnering er det underskrevet (scan af det underskrevne dokument) eller sendt det pr. Mail til
+FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index fc2a4f88f0e..033afd95e9b 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -24,11 +24,11 @@ InvoiceProForma=Proformafaktura
 InvoiceProFormaAsk=Proformafaktura
 InvoiceProFormaDesc=<b>Proformafakturaen</b> ligner en ægte faktura, men har ingen regnskabsmæssig værdi.
 InvoiceReplacement=Erstatningsfaktura.
-InvoiceReplacementAsk=Erstatningsfaktura som faktura
-InvoiceReplacementDesc=<b> Erstatningsfaktura </b> bruges til at annullere og erstatte en faktura uden betaling allerede modtaget. <br> <br> Bemærk! Kun fakturaer uden betaling på det kan erstattes. Hvis fakturaen du udskifter endnu ikke er lukket, lukkes den automatisk for at "forladt".
+InvoiceReplacementAsk=Erstatningsfaktura for faktura
+InvoiceReplacementDesc=<b>Erstatningsfaktura</b> bruges til at annullere og erstatte en faktura uden modtaget betaling . <br> <br> Bemærk! Kun fakturaer uden betaling på det kan erstattes. Hvis fakturaen du udskifter endnu ikke er lukket, lukkes den automatisk for at "forladt".
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota til korrektion af faktura
-InvoiceAvoirDesc=<b>Kreditnotaen</b> er en negativ faktura, der benyttes for at løse, at en faktura lyder på et beløb, der adskiller sig fra det beløb, der reelt skal betales (fordi kunden har betalt for meget ved en fejl, eller f.eks. har returneret nogle varer).
+InvoiceAvoirDesc=<b>Kreditnotaer</b> er en negativ faktura, der bruges til at korrigere det faktum, at en faktura har et beløb, som adskiller sig fra det beløb, der virkelig er betalt (f.eks. kunden betalte for meget ved en fejl eller vil ikke betale hele beløbet siden den returnerede nogle produkter).
 invoiceAvoirWithLines=Opret kreditnota med linjer fra oprindelsesfakturaen
 invoiceAvoirWithPaymentRestAmount=Opret kreditnota med resterende ubetalte oprindelsesfaktura
 invoiceAvoirLineWithPaymentRestAmount=Kreditnota for resterende ubetalte beløb
@@ -66,8 +66,8 @@ paymentInInvoiceCurrency=i fakturaer valuta
 PaidBack=Tilbagebetalt
 DeletePayment=Slet betaling
 ConfirmDeletePayment=Er du sikker på, at du vil slette denne betaling?
-ConfirmConvertToReduc=Ønsker du at konvertere denne %s til en absolut rabat? <br> Beløbet vil således blive gemt blandt alle rabatter og kunne bruges som rabat for en nuværende eller en fremtidig faktura for denne kunde.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Ønsker du at konvertere denne %s til en absolut rabat? <br> Beløbet vil blive gemt blandt alle rabatter og kan fremover bruges som rabat for en nuværende eller en fremtidig faktura for denne kunde.
+ConfirmConvertToReducSupplier=Ønsker du at konvertere denne %s til en absolut rabat? <br> Beløbet vil blive gemt blandt alle rabatter og kan bruges som rabat for en nuværende eller en fremtidig faktura for denne leverandør.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Modtagne betalinger
 ReceivedCustomersPayments=Modtagne kundebetalinger
@@ -91,8 +91,8 @@ PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Betalingsbeløb
 ValidatePayment=Godkend betaling
 PaymentHigherThanReminderToPay=Betaling højere end betalingspåmindelse
-HelpPaymentHigherThanReminderToPay=Bemærk at indbetalingsbeløbet af en eller flere regninger er højere end restbeløbet. <br> Ret beløbet eller godkend og påtænk at oprette en kreditnota lydende på det overskydende beløb.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Vær opmærksom på, at betalingsbeløbet på en eller flere regninger er højere end det udestående beløb, der skal betales. <br> Rediger din post, ellers bekræft og overvej at oprette en kreditnote for det overskydende beløb, der er modtaget for hver overbetalt faktura.
+HelpPaymentHigherThanReminderToPaySupplier=Vær opmærksom på, at betalingsbeløbet på en eller flere regninger er højere end det udestående beløb, der skal betales. <br> Rediger din post, ellers bekræft og overvej at oprette en kreditnota for det overskydende beløb, der betales for hver overbetalt faktura.
 ClassifyPaid=Klassificer som "Betalt"
 ClassifyPaidPartially=Klassificer som "Delvist betalt"
 ClassifyCanceled=Klassificer som "Tabt"
@@ -109,19 +109,19 @@ CancelBill=Annuller en faktura
 SendRemindByMail=Send påmindelse via e-mail
 DoPayment=Angiv betaling
 DoPaymentBack=Angiv tilbagebetaling
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertToReduc=Markér som kredit tilgængelig
+ConvertExcessReceivedToReduc=Konverter overskud modtaget til ledig kredit
+ConvertExcessPaidToReduc=Konverter overskud betalt til ledig rabat
 EnterPaymentReceivedFromCustomer=Angive betaling modtaget fra kunden
 EnterPaymentDueToCustomer=Opret påmindelse til kunde
 DisabledBecauseRemainderToPayIsZero=Deaktiveret, da restbeløbet er nul
 PriceBase=Basispris
 BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererede fakturaer
-BillStatusDraft=Udkast (skal valideres)
+BillStatusDraft=Udkast (skal bekræftes)
 BillStatusPaid=Betalt
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Kreditnota restitution eller markeret som kredit tilgængelig
+BillStatusConverted=Betalt (klar til forbrug i slutfaktura)
 BillStatusCanceled=Tabt
 BillStatusValidated=Godkendt (skal betales)
 BillStatusStarted=Startet
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Lukket (ubetalte)
 BillStatusClosedPaidPartially=Betalt (delvis)
 BillShortStatusDraft=Udkast
 BillShortStatusPaid=Betalt
-BillShortStatusPaidBackOrConverted=Tilbagebetal eller konverter
+BillShortStatusPaidBackOrConverted=Refunderet eller konverteret
+Refunded=refunderet
 BillShortStatusConverted=Betalt
 BillShortStatusCanceled=Tabt
 BillShortStatusValidated=Godkendt
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Ikke refunderet
 BillShortStatusClosedUnpaid=Lukket
 BillShortStatusClosedPaidPartially=Betalt (delvis)
 PaymentStatusToValidShort=Skal godkendes
-ErrorVATIntraNotConfigured=Momsregistreringsnummer endnu ikke defineret
+ErrorVATIntraNotConfigured=Momsnummer i Fællesskabet endnu ikke defineret
 ErrorNoPaiementModeConfigured=Ingen standardbetalingsmetode defineret. Gå til opsætning for fakturamodul for at rette dette.
-ErrorCreateBankAccount=Opret en bankkonto, og derefter gå til Setup panel af faktura modul til at definere betalingsformer
+ErrorCreateBankAccount=Opret en bankkonto, og gå derefter til Opsætningspanel i Faktura-modul for at definere betalingsformer
 ErrorBillNotFound=Faktura %s findes ikke
-ErrorInvoiceAlreadyReplaced=Fejl, du forsøger at validere en faktura, der skal erstatte faktura %s. Men denne er allerede blevet erstattet af faktura %s.
+ErrorInvoiceAlreadyReplaced=Fejl, du forsøgte at bekræfte en faktura for at erstatte faktura %s. Men denne er allerede erstattet af faktura %s.
 ErrorDiscountAlreadyUsed=Fejl, rabat allerede brugt
 ErrorInvoiceAvoirMustBeNegative=Fejl, korrekt faktura skal have et negativt beløb
 ErrorInvoiceOfThisTypeMustBePositive=Fejl, denne type faktura skal have et positivt beløb
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fejl, kan ikke annullere en faktura, som er blevet erstattet af en anden faktura, der stadig har status som udkast
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne del eller en anden er allerede brugt, så rabat serien kan ikke fjernes.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne del eller en anden er allerede brugt, så rabatserier kan ikke fjernes.
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger for faktura
@@ -179,30 +180,31 @@ ConfirmClassifyPaidBill=Er du sikker på, at du vil ændre fakturaen <b> %s </b>
 ConfirmCancelBill=Er du sikker på, at du vil annullere fakturaen <b> %s </b>?
 ConfirmCancelBillQuestion=Hvorfor vil du klassificere denne faktura 'forladt'?
 ConfirmClassifyPaidPartially=Er du sikker på, at du vil ændre fakturaen <b> %s </b> til betalte status?
-ConfirmClassifyPaidPartiallyQuestion=Denne faktura er ikke blevet betalt helt. Hvad er årsager til at du lukker denne faktura?
-ConfirmClassifyPaidPartiallyReasonAvoir=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt. Jeg regulerer momsen med en kreditnota.
+ConfirmClassifyPaidPartiallyQuestion=Denne faktura er ikke blevet betalt helt. Hvad er årsagen til at lukke denne faktura?
+ConfirmClassifyPaidPartiallyReasonAvoir=Resterende ubetalte <b>(%s %s)</b> er en rabat tildelt, fordi betaling blev foretaget i fortid. Jeg regulerer momsen med en kreditnota.
 ConfirmClassifyPaidPartiallyReasonDiscount=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt. Jeg accepterer at miste momsen på denne rabat.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Resterende ubetalte <b> (%s %s) </b> er en rabat tildelt, fordi betaling blev foretaget før sigt. Jeg inddriver momsen på denne rabat uden en kreditnota.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Resterende ubetalte <b>(%s %s)</b> er en rabat tildelt, fordi betaling blev foretaget i fortid. Jeg inddriver momsen på denne rabat uden en kreditnota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
 ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvist returneret
 ConfirmClassifyPaidPartiallyReasonOther=Beløb opgives for andre grunde
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Dette valg er muligt, hvis din faktura er blevet forsynet med passende kommentar. (Eksempel «Kun den afgift, der svarer til den pris, der rent faktisk var blevet betalt giver ret til fradrag»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=I nogle lande, dette valg kan kun mulig, hvis din faktura indeholder korrekte note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Dette valg er muligt, hvis din faktura er blevet forsynet med passende kommentarer. (Eksempel «Kun skatten svarende til den pris, der faktisk er betalt giver ret til fradrag«)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=I nogle lande kan dette valg kun være muligt, hvis din faktura indeholder korrekte noter.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Brug dette valg, hvis alle andre ikke passer
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=En <b>dårlig kunde</b> er en kunde, der nægter at betale sin gæld.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Dette valg bruges, når betalingen ikke er færdig, fordi nogle af varerne blev returneret
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Brug dette valg, hvis alle andre ikke passer, for eksempel i følgende situation: <br> - betaling ikke fuldført, fordi nogle varer blev sendt tilbage <br> - beløb for højt, fordi en rabat blev glemt <br> I alle tilfælde skal det overskydende beløb korrigeres i regnskabssystemet ved at oprette en kreditnota.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Brug dette valg hvis alle andre ikke er egnede, for eksempel i følgende situation: <br> - Betaling ikke fuldført, fordi nogle produkter blev sendt tilbage <br> - Beløb hævdede for vigtigt, fordi en rabat blev glemt <br> I alle tilfælde beløb Overskud skal korrigeres i regnskabssystemet ved at oprette en kreditnota.
 ConfirmClassifyAbandonReasonOther=Anden
 ConfirmClassifyAbandonReasonOtherDesc=Dette valg vil blive anvendt i alle andre tilfælde. For eksempel fordi du har planer om at oprette en erstatning faktura.
-ConfirmCustomerPayment=Bekræfter du denne betalings for <b> %s </b> %s?
-ConfirmSupplierPayment=Bekræfter du denne betalingsindgang for <b> %s </b> %s?
-ConfirmValidatePayment=Er du sikker på, at du vil validere denne betaling? Ingen ændring kan foretages, når betalingen er valideret.
+ConfirmCustomerPayment=Bekræfter du denne betaling for <b> %s </b> %s?
+ConfirmSupplierPayment=Bekræfter du denne betalings form for <b> %s </b> %s?
+ConfirmValidatePayment=Er du sikker på, at du vil bekræfte denne betaling? Ingen ændring kan foretages, når betalingen er bekræftet.
 ValidateBill=Godkend fakturaen
 UnvalidateBill=Fjern godkendelse af faktura
 NumberOfBills=Antal fakturaer
-NumberOfBillsByMonth=Antal fakturaer månedsvis
+NumberOfBillsByMonth=Antal fakturaer pr. Måned
 AmountOfBills=Mængden af fakturaer
+AmountOfBillsHT=Fakturabeløb (ekskl. Skat)
 AmountOfBillsByMonthHT=Mængden af ​​fakturaer efter måned (ekskl. moms)
 ShowSocialContribution=Vis skat/afgift
 ShowBill=Vis faktura
@@ -222,7 +224,7 @@ RemainderToPayBack=Resterende beløb at refundere
 Rest=Verserende
 AmountExpected=Fordret beløb
 ExcessReceived=Overskud modtaget
-ExcessPaid=Excess paid
+ExcessPaid=Overskydende betalt
 EscompteOffered=Rabat (betaling før sigt)
 EscompteOfferedShort=Discount
 SendBillRef=Indsendelse af faktura %s
@@ -240,7 +242,7 @@ SendReminderBillByMail=Send påmindelse via e-mail
 RelatedCommercialProposals=Relaterede tilbud
 RelatedRecurringCustomerInvoices=Tilknyttede tilbagevendende kundefaktuaer
 MenuToValid=På gyldige
-DateMaxPayment=Betaling på grund af
+DateMaxPayment=Betaling forfalder den
 DateInvoice=Fakturadato
 DatePointOfTax=Momsbetaling
 NoInvoice=Ingen faktura
@@ -260,9 +262,9 @@ Repeatables=Skabeloner
 ChangeIntoRepeatableInvoice=Konverter til fakturaskabelon
 CreateRepeatableInvoice=Opret fakturaskabelon
 CreateFromRepeatableInvoice=Opret fra fakturaskabelon
-CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
+CustomersInvoicesAndInvoiceLines=Kundefakturaer og faktura detaljer
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
-ExportDataset_invoice_1=Liste over kundefakturaer og fakturalinjer
+ExportDataset_invoice_1=Kundefakturaer og faktura detaljer
 ExportDataset_invoice_2=Kundefakturaer og betalinger
 ProformaBill=Proforma Bill:
 Reduction=Reduktion
@@ -282,29 +284,29 @@ RelativeDiscount=Relativ rabat
 GlobalDiscount=Global rabat
 CreditNote=Kreditnota
 CreditNotes=Kredit noter
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Kreditnotaer eller overskud modtaget
 Deposit=Forskudsbetaling
 Deposits=Indbetalinger
 DiscountFromCreditNote=Discount fra kreditnota %s
 DiscountFromDeposit=Indbetalinger på faktura %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=Denne form for kredit kan bruges på faktura før dens validering
-CreditNoteDepositUse=Faktura skal valideres for at bruge denne type kreditter
+DiscountFromExcessReceived=Betalinger ud over faktura %s
+DiscountFromExcessPaid=Betalinger ud over faktura %s
+AbsoluteDiscountUse=Denne form for kredit kan bruges på faktura før dens bekræftelse
+CreditNoteDepositUse=Faktura skal bekræftes for at bruge denne type kreditter
 NewGlobalDiscount=Ny discount
 NewRelativeDiscount=Ny relativ discount
-DiscountType=Discount type
+DiscountType=Rabat type
 NoteReason=Bemærk / Grund
 ReasonDiscount=Årsag
 DiscountOfferedBy=Ydet af
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+DiscountStillRemaining=Rabatter eller kreditter til rådighed
+DiscountAlreadyCounted=Rabatter eller kreditter, der allerede er forbrugt
+CustomerDiscounts=Kunderabatter
+SupplierDiscounts=Leverandører rabatter
 BillAddress=Faktura adresse
-HelpEscompte=Denne rabat er en rabat, der ydes til kunden, fordi dens paiement blev foretaget før sigt.
-HelpAbandonBadCustomer=Dette beløb er blevet opgivet (kunde siges at være en dårlig kunde) og betragtes som en exceptionnal løs.
-HelpAbandonOther=Dette beløb er blevet opgivet, da det var en fejl (forkert kunde eller faktura erstattes af en anden for eksempel)
+HelpEscompte=Denne rabat er en rabat til kunden, fordi betaling blev foretaget før forfaldsdatoen.
+HelpAbandonBadCustomer=Dette beløb er blevet opgivet (kunden lader til at være en dårlig kunde) og betragtes som et usædvanligt tab.
+HelpAbandonOther=Dette beløb er blevet opgivet, da det var en fejl (forkert kunde eller faktura erstattet af en anden for eksempel)
 IdSocialContribution=Vis ID for skat/afgift
 PaymentId=Betaling id
 PaymentRef=Betalings ref.
@@ -321,31 +323,31 @@ InvoiceNotChecked=Ingen valgt faktura
 CloneInvoice=Klon faktura
 ConfirmCloneInvoice=Er du sikker på, at du vil klone denne faktura <b> %s </b>?
 DisabledBecauseReplacedInvoice=Aktion handicappede, fordi fakturaen er blevet erstattet
-DescTaxAndDividendsArea=Dette område præsenterer et resumé af alle betalinger foretaget til særlige udgifter. Kun posten med betaling i det faste år er inkluderet her.
-NbOfPayments=Nb af betalinger
+DescTaxAndDividendsArea=Dette område præsenterer et resumé af alle betalinger foretaget til særlige udgifter. Kun poster med betaling i det faste år er inkluderet her.
+NbOfPayments=Antal betalinger
 SplitDiscount=Split rabat i to
-ConfirmSplitDiscount=Er du sikker på, at du vil opdele denne rabat på <b>%s</b> %s i 2 lavere rabatter?
-TypeAmountOfEachNewDiscount=Input beløb for hver af to dele:
-TotalOfTwoDiscountMustEqualsOriginal=Summen af to nye rabatter skal svare til det oprindelige rabatbeløb.
+ConfirmSplitDiscount=Er du sikker på, at du vil opdele denne rabat på <b> %s </b> %s i 2 mindre rabatter?
+TypeAmountOfEachNewDiscount=Indgangsbeløb for hver af to dele:
+TotalOfTwoDiscountMustEqualsOriginal=Samlet to nye rabatter skal svare til det oprindelige rabatbeløb.
 ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabat?
 RelatedBill=Relaterede faktura
 RelatedBills=Relaterede fakturaer
 RelatedCustomerInvoices=Tilknyttede kundefakturaer
 RelatedSupplierInvoices=Relaterede leverandørfakturaer
 LatestRelatedBill=Seneste relaterede faktura
-WarningBillExist=Advarsel, der findes en eller flere fakturaer
+WarningBillExist=Advarsel, der findes allerede en eller flere fakturaer
 MergingPDFTool=Sammenlægning af PDF-værktøj
 AmountPaymentDistributedOnInvoice=Betalingsbeløb fordelt på faktura
-PaymentOnDifferentThirdBills=Tillad betalinger på forskellige tredjeparts regninger, men samme moderselskab
+PaymentOnDifferentThirdBills=Tillad betaling på forskellige tredjeparts regninger, men samme moderselskab
 PaymentNote=Betalingsnota
 ListOfPreviousSituationInvoices=Liste over tidligere status fakturaer
 ListOfNextSituationInvoices=Liste over næste status fakturaer
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+ListOfSituationInvoices=Liste over situationsfakturaer
+CurrentSituationTotal=Samlet nuværende situation
+DisabledBecauseNotEnouthCreditNote=For at fjerne en faktura fra cyklus skal fakturaens kreditnota dække hele fakturaen
+RemoveSituationFromCycle=Fjern denne faktura fra cyklus
+ConfirmRemoveSituationFromCycle=Fjern denne faktura %s fra cyklus?
+ConfirmOuting=Bekræft udflugt
 FrequencyPer_d=Hver %s dage
 FrequencyPer_m=Hver %s måneder
 FrequencyPer_y=Hver %s år
@@ -355,10 +357,10 @@ NextDateToExecution=Dato for næste faktura generation
 NextDateToExecutionShort=Dato næste gener.
 DateLastGeneration=Dato for seneste generation
 DateLastGenerationShort=Dato seneste gener.
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
+MaxPeriodNumber=Maks antal fakturagenerering
+NbOfGenerationDone=Antal fakturagenerering allerede udført
+NbOfGenerationDoneShort=Antal genererede færdigheder
+MaxGenerationReached=Maksimalt antal generationer nået
 InvoiceAutoValidate=Validér fakturaer automatisk
 GeneratedFromRecurringInvoice=Genereret fra skabelon tilbagevendende faktura %s
 DateIsNotEnough=Dato er endnu ikke nået
@@ -394,7 +396,7 @@ PaymentConditionShort14DENDMONTH=14 dage i slutningen af ​​måneden
 PaymentCondition14DENDMONTH=Inden for 14 dage efter slutningen af ​​måneden
 FixAmount=Ret beløb
 VarAmount=Variabel mængde (%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountOneLine=Variabel mængde (%% tot.) - 1 linje med etiket '%s'
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Dokumenter mod betaling)
 PaymentTypeShortTIP=TIP Betaling
-PaymentTypeVAD=Online betaling
-PaymentTypeShortVAD=Online betaling
+PaymentTypeVAD=Netbetailng
+PaymentTypeShortVAD=Netbetailng
 PaymentTypeTRA=Bankudkast
 PaymentTypeShortTRA=Udkast til
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Bankoplysninger
 BankCode=Bankkode
-DeskCode=Skrivebord kode
+DeskCode=Kontorkode
 BankAccountNumber=Kontonummer
-BankAccountNumberKey=Nøgle
+BankAccountNumberKey=Tjek cifre
 Residence="Direkte debit"
-IBANNumber=IBAN-nummer
+IBANNumber=Komplet IBAN kontonummer
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT-nummer
@@ -436,7 +438,7 @@ NetToBePaid=Netto, at betale
 PhoneNumber=Tlf
 FullPhoneNumber=Telefon
 TeleFax=Fax
-PrettyLittleSentence=Accepter betalingsbeløbene grund af checks udstedt i mit navn, som et medlem af et regnskabssystem sammenslutning godkendt af skatteadministration.
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
 IntracommunityVATNumber=Inden for antallet af moms
 PaymentByChequeOrderedTo=Checkbetaling (inkl. moms) skal stiles til %s
 PaymentByChequeOrderedToShort=Checkbetaling (inkl. moms) skal stiles til
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Betaling ved overførsel på følgende bankko
 VATIsNotUsedForInvoice=* Ikke gældende moms kunst-293B af CGI
 LawApplicationPart1=Ved anvendelse af loven 80.335 af 12/05/80
 LawApplicationPart2=varerne forbliver ejendom
-LawApplicationPart3=sælgeren, indtil den fuldstændige indkassere af
+LawApplicationPart3=Sælgeren indtil fuld betaling af
 LawApplicationPart4=deres pris.
 LimitedLiabilityCompanyCapital=SARL med Capital af
 UseLine=Ansøge
@@ -463,32 +465,33 @@ Cheques=Checks
 DepositId=Id depositum
 NbCheque=Antal checks
 CreditNoteConvertedIntoDiscount=Dette %s er blevet konverteret til %s
-UsBillingContactAsIncoiveRecipientIfExist=Brug kundens kontakt-adresse fra faktura i stedet for tredjepartsadresse som modtager for fakturaer
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis sent unpaid faktura kun
 PaymentInvoiceRef=Betaling faktura %s
 ValidateInvoice=Validér faktura
-ValidateInvoices=Valider fakturaer
+ValidateInvoices=Bekræft fakturaer
 Cash=Kontanter
 Reported=Forsinket
 DisabledBecausePayments=Ikke muligt da der er nogle betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betaling, da der er mindst en faktura, der er klassificeret som betalt
 ExpectedToPay=Forventet betaling
-CantRemoveConciliatedPayment=Kan ikke fjerne udlignet betaling
+CantRemoveConciliatedPayment=Kan ikke fjerne afstemt betaling
 PayedByThisPayment=Betalt med denne betaling
-ClosePaidInvoicesAutomatically=Klassificer "Betalt" alle standard-, forskuds- eller udskiftningsfakturaer, der er fuldt ud betalt.
+ClosePaidInvoicesAutomatically=Klassificer "Betalt" alle standard-, nedbetalings- eller udskiftningsfakturaer, der betales helt.
 ClosePaidCreditNotesAutomatically=Klassificer "Betalt" alle kreditnotaer, der er fuldt ud betalt tilbage.
-ClosePaidContributionsAutomatically=Marker alle ydelser af skat/afgift som "Betalt"
-AllCompletelyPayedInvoiceWillBeClosed=Alle fakturaer med et restbeløb på nul, vil automatisk blive lukket med status "Betalt".
+ClosePaidContributionsAutomatically=Klassificer "Betalt" alle sociale eller skattemæssige bidrag fuldt ud betalt.
+AllCompletelyPayedInvoiceWillBeClosed=Alle fakturaer uden restbeløbet vil automatisk lukkes med status "Betalt".
 ToMakePayment=Betale
 ToMakePaymentBack=Tilbagebetalt
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Bemærk: Denne liste indeholder kun fakturaer til tredjeparter, som du er knyttet til som salgsrepræsentant.
 RevenueStamp=Indtægtsstempel
-YouMustCreateInvoiceFromThird=Denne mulighed er kun tilgængelig, når du opretter faktura fra fanen "kunde" hos tredjepart
-YouMustCreateInvoiceFromSupplierThird=Denne mulighed er kun tilgængelig, når du opretter faktura fra fanen "leverandør" af tredjepart
+YouMustCreateInvoiceFromThird=Denne indstilling er kun tilgængelig, når du opretter fakturaer fra fanen "kunde" af tredjepart
+YouMustCreateInvoiceFromSupplierThird=Denne mulighed er kun tilgængelig, når du opretter fakturaer fra fanen "leverandør" af tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du skal først oprette en standardfaktura og konvertere den til "skabelon" for at oprette en ny skabelonfaktura
 PDFCrabeDescription=Faktura model Crabe. En fuldstændig faktura model (Support moms option, rabatter, betalinger betingelser, logo, etc. ..)
+PDFSpongeDescription=Faktura PDF skabelon opsætning. En komplet faktura skabelon
 PDFCrevetteDescription=Faktura PDF skabelon Crevette. En komplet faktura skabelon for kontoudtog
 TerreNumRefModelDesc1=Retur nummer med format %syymm-nnnn for standard faktura og %syymm-nnnn for kreditnoter hvor du er år, mm er måned og nnnn er en sekvens uden pause og ingen tilbagevenden til 0
 MarsNumRefModelDesc1=Retur nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for udskiftningsfakturaer, %syymm-nnnn til fakturaer med forskud og %syymm-nnnn for kreditnoter hvor du er år, mm er måned og nnnn er en sekvens uden pause og nej vende tilbage til 0
@@ -513,13 +516,13 @@ SituationAmount=Kontoudtog beløb (netto)
 SituationDeduction=Kontoudtog udtræk
 ModifyAllLines=Rediger alle linjer
 CreateNextSituationInvoice=Opret næste situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+ErrorFindNextSituationInvoice=Fejl kunne ikke finde næste situation cyklus ref
+ErrorOutingSituationInvoiceOnUpdate=Kan ikke udlade denne situation faktura.
+ErrorOutingSituationInvoiceCreditNote=Kan ikke udveksle tilknyttet kreditnota.
 NotLastInCycle=Denne faktura er ikke den seneste i cyklus og må ikke ændres.
 DisabledBecauseNotLastInCycle=Den næste situation eksisterer allerede.
 DisabledBecauseFinal=Denne situation er endelig.
-situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_AS=A/S
 situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=Værdien kan ikke være mindre end dets værdi i den foregående situation.
 NoSituations=Ingen åbne situationer
@@ -533,7 +536,7 @@ invoiceLineProgressError=Faktura linje fremskridt kan ikke være større end ell
 updatePriceNextInvoiceErrorUpdateline=Fejl: opdateringspris på faktura linje: %s
 ToCreateARecurringInvoice=For at oprette en tilbagevendende faktura for denne kontrakt skal du først oprette dette udkast faktura og derefter konvertere det til en faktura skabelon og definere hyppigheden for generering af fremtidige fakturaer.
 ToCreateARecurringInvoiceGene=For at generere fremtidige fakturaer regelmæssigt og manuelt, skal du bare gå i menuen <strong> %s - %s - %s </strong>.
-ToCreateARecurringInvoiceGeneAuto=Hvis du har brug for at generere sådanne fakturaer automatisk, så spørg administratoren om at aktivere og opsætte modulet <strong> %s </strong>. Bemærk at begge metoder (manuel og automatisk) kan bruges sammen med ingen risiko for overlapning.
+ToCreateARecurringInvoiceGeneAuto=Hvis du skal generere sådanne fakturaer automatisk, skal du bede din administrator om at aktivere og opsætte modulet <strong> %s </ strong>. Bemærk at begge metoder (manuel og automatisk) kan bruges sammen med ingen risiko for overlapning.
 DeleteRepeatableInvoice=Slet fakturaskabelon
 ConfirmDeleteRepeatableInvoice=Er du sikker på, at du vil slette fakturaenskabelon?
 CreateOneBillByThird=Opret en faktura pr. Tredjepart (ellers en faktura pr. Ordre)
@@ -541,8 +544,9 @@ BillCreated=%s regning(er) oprettet
 StatusOfGeneratedDocuments=Status for dokument generering
 DoNotGenerateDoc=Generer ikke dokument fil
 AutogenerateDoc=Auto generere dokument fil
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+AutoFillDateFrom=Indstil startdato for servicelinje med fakturadato
+AutoFillDateFromShort=Indstil startdato
+AutoFillDateTo=Indstil slutdato for servicelinje med næste faktura dato
+AutoFillDateToShort=Indstil slutdato
+MaxNumberOfGenerationReached=Maks antal gener. nået
+BILL_DELETEInDolibarr=Faktura slettet
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index aa99a009866..73fdfff42a8 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Vis virksomhed
 ShowStock=Vis lager
 DeleteArticle=Klik for at fjerne denne artikel
 FilterRefOrLabelOrBC=Søg (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=Du beder om at reducere lageret ved fakturaoprettelse, så brugeren, der bruger kasseapparatet, skal have tilladelse til at redigere lager.
+UserNeedPermissionToEditStockToUsePos=Du beder om at reducere lager på fakturaoprettelse, så brugere, der anvender POS, skal have tilladelse til at ændre i varelageret.
 DolibarrReceiptPrinter=Dolibarr kvitteringsprinter
+PointOfSale=Kasseapparat
+PointOfSaleShort=POS
+CloseBill=Luk Bill
+Floors=Gulve
+Floor=Etage
+AddTable=Tilføj bord
+Place=Placere
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Bestil printere
+SearchProduct=Søg produkt
diff --git a/htdocs/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang
index 2fa192efe4b..a7cf1c21954 100644
--- a/htdocs/langs/da_DK/commercial.lang
+++ b/htdocs/langs/da_DK/commercial.lang
@@ -3,8 +3,8 @@ Commercial=Tilbud
 CommercialArea=Tilbudsområde
 Customer=Kunde
 Customers=Kunder
-Prospect=Emne
-Prospects=Emner
+Prospect=Potentiel kunde
+Prospects=Potentielle kunder
 DeleteAction=Slet en begivenhed
 NewAction=Ny begivenhed
 AddAction=Opret begivenhed
@@ -26,8 +26,8 @@ SalesRepresentativeFollowUp=Salg repræsentant (opfølgning)
 SalesRepresentativeSignature=Salgsrepræsentant (underskrift)
 NoSalesRepresentativeAffected=Ingen specifik salgsrepræsentant tildelt
 ShowCustomer=Vis kunde
-ShowProspect=Vis emne
-ListOfProspects=Liste over emner
+ShowProspect=Vis potentiel kunde
+ListOfProspects=Liste over potentielle kunder
 ListOfCustomers=Liste over kunder
 LastDoneTasks=Senest %s gennemførte opgaver
 LastActionsToDo=Ældste %s udestående opgaver
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonopkald
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send tilbud via e-mail
 ActionAC_EMAIL=Send e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Møder
 ActionAC_INT=Fremmøde på stedet
 ActionAC_FAC=Send kundefaktura via e-mail
@@ -60,20 +61,20 @@ ActionAC_CLO=Luk
 ActionAC_EMAILING=Send masse e-mail
 ActionAC_COM=Send kundeordre med posten
 ActionAC_SHIP=Send forsendelse med posten
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Send indkøbsordre via post
+ActionAC_SUP_INV=Send sælgerfaktura pr. Post
 ActionAC_OTH=Andet
 ActionAC_OTH_AUTO=Automatisk oprettede begivenheder
 ActionAC_MANUAL=Manuelt oprettede begivenheder
 ActionAC_AUTO=Automatisk oprettede begivenheder
 ActionAC_OTH_AUTOShort=Auto
 Stats=Salgsstatistik
-StatusProsp=Status for emne
+StatusProsp=Status på potentielle kunder status
 DraftPropals=Udkast for tilbud
 NoLimit=Ingen grænse
 ToOfferALinkForOnlineSignature=Link til online signatur
-WelcomeOnOnlineSignaturePage=Velkommen på siden for at acceptere kommercielle forslag fra %s
+WelcomeOnOnlineSignaturePage=Velkommen til siden for at acceptere kommercielle forslag fra %s
 ThisScreenAllowsYouToSignDocFrom=Denne skærm giver dig mulighed for at acceptere og underskrive eller nægte et tilbud / kommercielt forslag
 ThisIsInformationOnDocumentToSign=Dette er oplysninger om dokumentet for at acceptere eller afvise
-SignatureProposalRef=Undertegnelse af tilbud / kommercielt forslag %s
+SignatureProposalRef=Underskrift af tilbud / kommercielt forslag %s
 FeatureOnlineSignDisabled=Funktion til online-signering deaktiveret eller dokument genereret, før funktionen blev aktiveret
diff --git a/htdocs/langs/da_DK/dict.lang b/htdocs/langs/da_DK/dict.lang
index 2d4fd9c9da8..5cdc71c8abc 100644
--- a/htdocs/langs/da_DK/dict.lang
+++ b/htdocs/langs/da_DK/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard-og McDonald
 CountryVA=Pavestolen (Vatikanstaten)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Island
 CountryIN=Indien
 CountryID=Indonesien
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Nordkorea
 CountryKR=Sydkorea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kirgisistan
 CountryLA=Lao
 CountryLV=Letland
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongoliet
 CountryMS=Montserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad og Tobago
 CountryTR=Tyrkiet
 CountryTM=Turkmenistan
-CountryTC=Turks-og Cailos Øer
+CountryTC=Turks og Caicosøerne
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index 78ceaa171c2..0525e241c0c 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb af dokumenter i biblioteket
+ECMNbOfDocs=Antal dokumenter i mappen
 ECMSection=Directory
 ECMSectionManual=Manual bibliotek
 ECMSectionAuto=Automatisk bibliotek
@@ -34,18 +34,19 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Ingen mappe oprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relativ mappe for filer
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Fjernelse ikke mulig, fordi den indeholder nogle filer eller undermapper
+CannotRemoveDirectoryContainsFiles=Fjernelse ikke mulig, fordi den indeholder nogle filer
 ECMFileManager=Filhåndtering
-ECMSelectASection=Select a directory in the tree...
+ECMSelectASection=Vælg en mappe i træet ...
 DirNotSynchronizedSyncFirst=Denne mappe synes at være oprettet eller ændret uden for ECM-modulet. Du skal klikke på "Resync" knappen først for at synkronisere disk og database for at få indhold i denne mappe.
 ReSyncListOfDir=Resync liste over mapper
 HashOfFileContent=Hash af fil indhold
-FileNotYetIndexedInDatabase=Filen er endnu ikke indekseret i database (prøv at genoplaste den)
-FileSharedViaALink=Fil deles via et link
 NoDirectoriesFound=Ingen mapper fundet
+FileNotYetIndexedInDatabase=Filen er endnu ikke indekseret i database (prøv at genoplaste den)
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index e83b590ecaa..5e79fc6291c 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=Du angiver et anslået beløb for denne potentiel kunde / potentiel kunde. Så du skal også indtaste sin status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=Der er opstået en fejl, når ændringerne gemmes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=Produktets stregkode %s eksisterer allerede på
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Bemærk også, at brug af virtuelt produkt med automatisk forøgelse / nedsættelse af underprodukter ikke er mulig, når mindst et underprodukt (eller underprodukt af underprodukter) har brug for et serienummer / parti nummer.
 ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis produkt
 ErrorAPageWithThisNameOrAliasAlreadyExists=Siden / beholderen <strong> %s </ strong> har samme navn eller alternativt alias som den, du forsøger at bruge
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Obligatoriske installationsparametre er endnu ikke defineret
diff --git a/htdocs/langs/da_DK/help.lang b/htdocs/langs/da_DK/help.lang
index 2a4f59d723b..a7bf29c88c2 100644
--- a/htdocs/langs/da_DK/help.lang
+++ b/htdocs/langs/da_DK/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online realtid / fjernsupport
 OtherSupport=Anden support
 ToSeeListOfAvailableRessources=Til at kontakte / se tilgængelige ressourcer:
 HelpCenter=Hjælp
-DolibarrHelpCenter=Dolibarr Hjælp og support
-ToGoBackToDolibarr=Ellers klik <a href="%s">her for at bruge Dolibarr</a>
-TypeOfSupport=Kilde til støtte
+DolibarrHelpCenter=Dolibarr Hjælp og supportcenter
+ToGoBackToDolibarr=Ellers <a href="%s"> Klik her for at fortsætte med at bruge Dolibarr </a>.
+TypeOfSupport=Type af støtte
 TypeSupportCommunauty=Fællesskab (fri)
 TypeSupportCommercial=Tilbud
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Effektivitet
 TypeHelpOnly=Hjælp kun
 TypeHelpDev=Hjælp + Udvikling
-TypeHelpDevForm=Hjælp + Development + Formation
-ToGetHelpGoOnSparkAngels1=Nogle virksomheder kan give en hurtig (engang øjeblikkelig) og mere effektiv online support ved at tage kontrol over computeren. Sådanne hjælpere kan findes <b>på %s</b> hjemmeside:
-ToGetHelpGoOnSparkAngels3=Du kan også gå til listen over alle tilgængelige coaches for Dolibarr, for dette skal du klikke på knappen
-ToGetHelpGoOnSparkAngels2=Sommetider er der ingen virksomhed til rådighed på det tidspunkt, du gør din søgning, så tror at ændre filteret til at se for "alle tilgængelighed". Du vil være i stand til at sende flere anmodninger.
-BackToHelpCenter=Ellers klik her for at gå <a href="%s">tilbage til Hjælp startside.</a>
-LinkToGoldMember=Du kan ringe til en af ​​de træner, der er valgt af Dolibarr for dit sprog (%s) ved at klikke på Widget (status og maksimumspris opdateres automatisk):
+TypeHelpDevForm=Hjælp + Udvikling + Træning
+BackToHelpCenter=Ellers <a href="%s"> gå tilbage til Hjemmesiden til Hjælpecenter </a>.
+LinkToGoldMember=Du kan ringe til en af ​​de undervisere, der er valgt af Dolibarr for dit sprog (%s) ved at klikke på deres Widget (status og maksimumspris opdateres automatisk):
 PossibleLanguages=Understøttede sprog
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Hjælp Dolibarr-projektet, abonner på fundamentet
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index 477a20d890d..2ed8bb645e6 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Forlade
+CPTitreMenu=Forlade
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=Du skal aktivere modulet Forlad for at se denne side.
 AddCP=Make a leave request
 DateDebCP=Startdato
 DateFinCP=Slutdato
@@ -15,13 +15,18 @@ ApprovedCP=Godkendt
 CancelCP=Aflyst
 RefuseCP=Afviste
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=Liste over orlov
+LeaveId=Forlad ID
 ReviewedByCP=Will be reviewed by
+UserForApprovalID=Bruger til godkendelses-id
+UserForApprovalFirstname=Fornavn af godkendelsesbruger
+UserForApprovalLastname=Efternavn af godkendelsesbruger
+UserForApprovalLogin=Login af godkendelse bruger
 DescCP=Beskrivelse
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Udgiftsbalance
+SoldeCPUser=Forløbsbalancen er <b> %s </ b> dage.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type orlov ID
+TypeOfLeaveCode=Type orlovskode
+TypeOfLeaveLabel=Orlovsetikettype
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Dage forbrugt
+NbUseDaysCPShortInMonth=Dage indtages i måneden
+DateStartInMonth=Startdato i måned
+DateEndInMonth=Slutdato i måned
 EditCP=Redigér
 DeleteCP=Slet
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=Du er ikke den tildelte godkendende
 MotifCP=Årsag
 UserCP=Bruger
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -79,12 +92,17 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-
+LastHolidays=Seneste %s forlade anmodninger
+AllHolidays=Alle anmodninger om orlov
+HalfDay=Halv dag
+NotTheAssignedApprover=Du er ikke den tildelte godkendende
+LEAVE_PAID=Betalt ferie
+LEAVE_SICK=Sygeorlov
+LEAVE_OTHER=Anden orlov
+LEAVE_PAID_FR=Betalt ferie
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Seneste automatiske opdatering af orlovallokering
+MonthOfLastMonthlyUpdate=Måned for seneste automatiske opdatering af tilladelse til orlov
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Gå ind i <strong> Hjem - Opsætning - Ordbøger - Typen af ​​orlov </ strong> for at opsætte de forskellige typer blade.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index b38323998a0..b83f36fb97b 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Bare følg instruktionerne trin for trin.
 MiscellaneousChecks=Forudsætninger check
 ConfFileExists=<b>Konfigurationsfil %s</b> eksisterer.
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>Konfigurationsfil %s</b> eksisterer ikke og kunne ikke oprettes!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurationsfilen <b> %s </ b> eksisterer ikke og kunne ikke oprettes!
 ConfFileCouldBeCreated=<b>Konfigurationsfil %s</b> kunne oprettes.
-ConfFileIsNotWritable=<b>Konfigurationsfil %s</b> er ikke skrivbar. Check permissions. For første installation, webserveren skal ydes for at kunne skrive i denne fil under konfigurationen ( "chmod 666" for eksempel på Unix-lignende OS).
+ConfFileIsNotWritable=Konfigurationsfilen <b> %s </ b> kan ikke skrives. Tjek tilladelser. Til første installation skal din webserver være i stand til at skrive i denne fil under konfigurationsprocessen ("chmod 666" for eksempel på et Unix-lignende OS).
 ConfFileIsWritable=<b>Konfigurationsfil %s</b> er skrivbar.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Genindlæs alle oplysninger fra konfigurationsfilen.
+ConfFileMustBeAFileNotADir=Konfigurationsfil <b> %s </b>skal være en fil, ikke en mappe.
+ConfFileReload=Genindlæsning af parametre fra konfigurationsfilen.
 PHPSupportSessions=Denne PHP understøtter sessioner.
 PHPSupportPOSTGETOk=Denne PHP understøtter variablerne POST og GET.
-PHPSupportPOSTGETKo=Det er muligt, at din PHP-opsætning ikke understøtter variablerne POST og/eller GET. Tjek din parameter <b>variables_order</b> i php.ini.
-PHPSupportGD=Denne PHP understøtter GD grafiske funktioner.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Denne PHP understøtter UTF8 funktioner.
+PHPSupportPOSTGETKo=Det er muligt, at din PHP opsætning ikke understøtter variabler POST og / eller GET. Kontroller parameteren <b> variables_order </ b> i php.ini.
+PHPSupportGD=Dette PHP understøtter GD grafiske funktioner.
+PHPSupportCurl=Dette PHP understøtter Curl.
+PHPSupportUTF8=Dette PHP understøtter UTF8 funktioner.
 PHPMemoryOK=Din PHP max session hukommelse er sat <b>til %s.</b> Dette skulle være nok.
-PHPMemoryTooLow=Din PHP max session hukommelse er sat <b>til %s</b> bytes. Dette skulle være for lav. Skift din <b>php.ini</b> at indstille <b>memory_limit</b> parameter til <b>mindst %s</b> bytes.
-Recheck=Klik her for en mere significative test
-ErrorPHPDoesNotSupportSessions=Din PHP-installation understøtter ikke sessioner. Denne funktion er nødvendig for at få Dolibarr til at fungere. Tjek din PHP-opsætning.
-ErrorPHPDoesNotSupportGD=Din PHP-installation understøtter ikke den grafiske funktion GD. Ingen grafer vil være til rådighed.
+PHPMemoryTooLow=Din PHP max-sessionshukommelse er indstillet til <b> %s </ b> bytes. Dette er for lavt. Skift din <b> php.ini </ b> for at indstille parameteren <b> memory_limit </ b> til mindst <b> %s </ b> bytes.
+Recheck=Klik her for en mere detaljeret test
+ErrorPHPDoesNotSupportSessions=Din PHP-installation understøtter ikke sessioner. Denne funktion er nødvendig for at tillade Dolibarr at arbejde. Tjek din PHP opsætning og tilladelser i sessions biblioteket.
+ErrorPHPDoesNotSupportGD=Din PHP-installation understøtter ikke GD grafiske funktioner. Ingen grafer vil være tilgængelige.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Din PHP-installation understøtter ikke UTF8-funktioner. Dolibarr kan ikke fungere korrekt. Løs dette før du installerer Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Din PHP-installation understøtter ikke UTF8-funktioner. Dolibarr kan ikke fungere korrekt. Løs dette inden du installerer Dolibarr.
 ErrorDirDoesNotExists=Directory %s ikke eksisterer.
-ErrorGoBackAndCorrectParameters=Gå tilbage og ret forkerte parametre.
+ErrorGoBackAndCorrectParameters=Gå tilbage og kontroller / korrigér parametrene.
 ErrorWrongValueForParameter=Du kan have indtastet en forkert værdi for parameter ' %s'.
 ErrorFailedToCreateDatabase=Kunne ikke oprette databasen ' %s'.
 ErrorFailedToConnectToDatabase=Det lykkedes ikke at oprette forbindelse til databasen ' %s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version for gammel. Version %s er påkrævet.
-ErrorConnectedButDatabaseNotFound=Forbindelsen til serveren vellykket men database ' %s' blev ikke fundet.
+ErrorConnectedButDatabaseNotFound=Forbindelse til server succesfuld men database '%s' ikke fundet.
 ErrorDatabaseAlreadyExists=Database ' %s' eksisterer allerede.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke findes, gå tilbage og tjek valgmulighed "Opret database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke findes, skal du gå tilbage og kontrollere indstillingen "Opret database".
 IfDatabaseExistsGoBackAndCheckCreate=Hvis database findes allerede, gå tilbage og fjern markeringen "Opret database" valgmulighed.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version af browser er for gammel. Opgradering af din browser til en nyere version af Firefox, Chrome eller Opera anbefales stærkt.
 PHPVersion=PHP Version
 License=Bruger licens
 ConfigurationFile=Opsætningsfil
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Navn eller IP-adresse til database-serveren, som normalt 'localhost', når database-serveren er hostet på samme server end webserver
+ServerAddressDescription=Navn eller ip-adresse til databaseserveren. Normalt 'localhost', når databaseserveren er hostet på den samme server som webserveren.
 ServerPortDescription=Database serverport. Opbevar tomme hvis ukendt.
 DatabaseServer=Database server
 DatabaseName=Database navn
-DatabasePrefix=Database prefix table
-AdminLogin=Log ind for Dolibarr database administrator. Hold tomme, hvis du slutter i anonym
-PasswordAgain=Gentag adgangskode en anden gang
+DatabasePrefix=Database tabel præfiks
+DatabasePrefixDescription=Database tabel præfiks. Hvis tom, er standardindstillingen llx_.
+AdminLogin=Brugerkonto til Dolibarr database ejer.
+PasswordAgain=Skriv password bekræftelse igen
 AdminPassword=Adgangskode til Dolibarr database administrator. Hold tomme, hvis du slutter i anonym
 CreateDatabase=Opret database
-CreateUser=Opret ejer eller give ham tilladelse til database
+CreateUser=Opret brugerkonto eller give tilladelse til brugerkonto på Dolibarr-databasen
 DatabaseSuperUserAccess=Database - SuperUser adgang
-CheckToCreateDatabase=Afkrydsningsfelt, hvis databasen ikke eksisterer og skal være oprettet. <br> I dette tilfælde skal du udfylde login / password for SuperUser konto nederst på denne side.
-CheckToCreateUser=Afkrydsningsfelt, hvis databasen ejer ikke eksisterer og skal oprettes, eller hvis den findes, men databasen ikke eksisterer og tilladelser skal gives. <br> I dette tilfælde skal du vælge login og adgangskode og også udfylde login / adgangskode for superbrugerkontoen nederst på denne side. Hvis dette felt ikke er markeret, skal ejerdatabasen og dets adgangskoder eksistere.
-DatabaseRootLoginDescription=Log ind på den bruger lov til at oprette nye databaser eller nye brugere, ubrugelige, hvis din database og din database login findes allerede (ligesom når du er vært ved en web hosting provider).
-KeepEmptyIfNoPassword=Efterlad tom, hvis brugeren ikke har nogen adgangskode (undgå dette)
-SaveConfigurationFile=Gem værdier
+CheckToCreateDatabase=Marker afkrydsningsfeltet, hvis databasen ikke eksisterer endnu, og så skal der oprettes. <br> I dette tilfælde skal du også udfylde brugernavnet og adgangskoden til superbrugerkontoen nederst på denne side.
+CheckToCreateUser=Markér afkrydsningsfeltet, hvis: <br> databasens brugerkonto endnu ikke eksisterer, og så skal der oprettes, eller <br> hvis brugerkontoen findes, men databasen ikke eksisterer, og der skal gives tilladelser. <br> I dette tilfælde, Du skal indtaste brugerkontoen og adgangskoden og <b> også </ b> superbrugerkontonavnet og adgangskoden nederst på denne side. Hvis denne boks ikke er markeret, skal database ejer og adgangskode allerede eksistere.
+DatabaseRootLoginDescription=Superuser kontonavn (for at oprette nye databaser eller nye brugere), obligatorisk, hvis databasen eller dens ejer ikke allerede eksisterer.
+KeepEmptyIfNoPassword=Forlad tom, hvis superbrugeren ikke har noget kodeord (IKKE anbefalet)
+SaveConfigurationFile=Gem parametre til
 ServerConnection=Serverforbindelse
 DatabaseCreation=Database skabelse
 CreateDatabaseObjects=Database-objekter skabelse
@@ -71,75 +72,75 @@ CreateOtherKeysForTable=Opret udenlandske nøgler og indekser for tabel %s
 OtherKeysCreation=Udenlandske nøgler og indekserer skabelse
 FunctionsCreation=Funktioner skabelse
 AdminAccountCreation=Administrator login skabelse
-PleaseTypePassword=Indtast en adgangskode, tomme adgangskoder er ikke tilladt!
-PleaseTypeALogin=Indtast et login!
-PasswordsMismatch=Passwords er forskellig, prøv igen!
-SetupEnd=Slutningen af setup
+PleaseTypePassword=Indtast venligst et kodeord, tomme adgangskoder er ikke tilladt!
+PleaseTypeALogin=Indtast venligst et login!
+PasswordsMismatch=Adgangskoder adskiller sig, prøv igen!
+SetupEnd=Afslutningen af ​​opsætningen
 SystemIsInstalled=Denne installationen er færdig.
 SystemIsUpgraded=Dolibarr er blevet opgraderet med succes.
 YouNeedToPersonalizeSetup=Du er nødt til at konfigurere Dolibarr at matche dine behov (udseende, funktioner, ...). For at gøre dette, skal du følge nedenstående link:
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Gå til Dolibarr
 GoToSetupArea=Gå til Dolibarr (opsætning)
-MigrationNotFinished=Versionen af din database er ikke helt up to date, så du bliver nødt til at køre opgraderingen igen.
+MigrationNotFinished=Databaseversionen er ikke helt opdateret: Kør opgraderingsprocessen igen.
 GoToUpgradePage=Gå til opgradere siden igen
 WithNoSlashAtTheEnd=Uden skråstreg "/" i slutningen
-DirectoryRecommendation=Det er opfordres der til at bruge en mappe uden for din mappe på dine websider.
+DirectoryRecommendation=Det anbefales at bruge en mappe uden for websiderne.
 LoginAlreadyExists=Allerede findes
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administratorkonto <b>' %s'</b> eksisterer allerede.
+AdminLoginAlreadyExists=Dolibarr administratorkonto '<b> %s </ b>' eksisterer allerede. Gå tilbage, hvis du vil oprette en anden.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Advarsel, af sikkerhedshensyn, når de installerer eller opgraderer er færdig, bør du fjerne <b>installationen mappe eller omdøbe den til install.lock for at undgå sin ondsindet brug.</b>
-FunctionNotAvailableInThisPHP=Ikke til rådighed på dette PHP
+WarningRemoveInstallDir=Advarsel af sikkerhedshensyn, når installationen eller opgraderingen er færdig, skal du tilføje en fil kaldet <b> install.lock </ b> i Dolibarr-dokumentmappen for at forhindre utilsigtet / ondsindet brug af installationsværktøjerne igen.
+FunctionNotAvailableInThisPHP=Ikke tilgængelig i dette PHP
 ChoosedMigrateScript=Valgt migrere script
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+DataMigration=Databasemigration (data)
+DatabaseMigration=Databasemigration (struktur + nogle data)
 ProcessMigrateScript=Script forarbejdning
 ChooseYourSetupMode=Vælg din opsætning mode, og klik på "Start" ...
 FreshInstall=Frisk installation
-FreshInstallDesc=Brug denne tilstand, hvis dette er din første installation. Hvis ikke, denne tilstand kan reparere en tidligere ufuldstændige installere, men hvis du ønsker at opgradere din version, kan du vælge "Opdater"-tilstand.
+FreshInstallDesc=Brug denne tilstand, hvis dette er din første installation. Hvis ikke, kan denne tilstand reparere en ufuldstændig tidligere installation. Hvis du vil opgradere din version, skal du vælge "Opgrader" -tilstand.
 Upgrade=Upgrade
 UpgradeDesc=Brug denne tilstand, hvis du har erstattet gamle Dolibarr filer med filerne fra en nyere version. Dette vil opgradere din database og data.
 Start=Start
 InstallNotAllowed=Setup ikke tilladt ved <b>conf.php</b> tilladelser
 YouMustCreateWithPermission=Du skal oprette fil %s og sæt skrive tilladelser på det for web server under installere proces.
-CorrectProblemAndReloadPage=Ret problemet og tryk F5 for at genindlæse siden.
+CorrectProblemAndReloadPage=Ret venligst problemet, og tryk på F5 for at genindlæse siden.
 AlreadyDone=Allerede migreret
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=Du skal oprette denne mappe og giver mulighed for at web-serveren til at skrive i den.
 DBSortingCollation=Tegn sortering orden
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Du beder om at oprette <b>databasen %s,</b> men for dette, Dolibarr behovet for at oprette forbindelse til <b>serveren %s</b> med <b>superbruger %s</b> tilladelser.
-YouAskLoginCreationSoDolibarrNeedToConnect=Du beder om at oprette database <b>login %s,</b> men for dette, Dolibarr behovet for at oprette forbindelse til <b>serveren %s</b> med <b>superbruger %s</b> tilladelser.
-BecauseConnectionFailedParametersMayBeWrong=Som forbindelse mislykkedes, vært eller superbruger parametre skal være forkerte.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Du har valgt at oprette database <b> %s </ b>, men Dolibarr skal tilslutte til server <b> %s </ b> med superbruger <b> %s </ b> tilladelser.
+YouAskLoginCreationSoDolibarrNeedToConnect=Du har valgt at oprette databasebruger <b> %s </ b>, men Dolibarr skal tilslutte til serveren <b> %s </ b> med superbrugerne <b> %s </ b> tilladelser.
+BecauseConnectionFailedParametersMayBeWrong=Databaseforbindelsen mislykkedes: Værts- eller superbrugerparametrene skal være forkerte.
 OrphelinsPaymentsDetectedByMethod=Orphelins betaling opdaget ved metoden %s
 RemoveItManuallyAndPressF5ToContinue=Fjern det manuelt, og tryk på F5 for at fortsætte.
 FieldRenamed=Felt omdøbt
-IfLoginDoesNotExistsCheckCreateUser=Hvis login ikke findes endnu, skal du kontrollere option "Opret bruger"
-ErrorConnection=Server <b>" %s",</b> databasenavn <b>" %s"</b> login <b>" %s",</b> eller database password kan være forkerte eller PHP klientversionen kan være for gammel i forhold til database version.
+IfLoginDoesNotExistsCheckCreateUser=Hvis brugeren ikke eksisterer endnu, skal du kontrollere indstillingen "Opret bruger"
+ErrorConnection=Server "<b> %s </ b>", databasens navn "<b> %s </ b>", log ind "<b> %s </ b>", eller databaseadgangskoden kan være forkert, eller PHP-klientversionen kan være for gammel i forhold til databaseversionen.
 InstallChoiceRecommanded=Anbefalet valg til at installere version <b>%s</b> fra din nuværende version <b>%s</b>
 InstallChoiceSuggested=<b>Installer valg foreslået af installationsprogrammet.</b>
-MigrateIsDoneStepByStep=De målrettede version (%s) har et efterslæb på flere versioner, så installere guiden vil komme tilbage, der tyder på næste migration, når denne ene vil være færdig.
-CheckThatDatabasenameIsCorrect=Kontroller, at databasen navnet <b>"%s"</b> er korrekt.
+MigrateIsDoneStepByStep=Den målrettede version (%s) har et hul i flere versioner. Installationsguiden kommer tilbage for at foreslå en yderligere migrering, når denne er færdig.
+CheckThatDatabasenameIsCorrect=Kontroller, at databasenavnet "<b> %s </ b>" er korrekt.
 IfAlreadyExistsCheckOption=Hvis dette navn er korrekte, og at databasen ikke findes endnu, skal du kontrollere indstillingen "Opret database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Du har markeret afkrydsningsfeltet "Opret database". Til dette skal du give login / password på superbruger (i bunden af skemaet).
-YouAskToCreateDatabaseUserSoRootRequired=Du har markeret afkrydsningsfeltet "Opret database ejer". Til dette skal du give login / password på superbruger (i bunden af skemaet).
-NextStepMightLastALongTime=Nuværende trin kan vare flere minutter. Vent venligst indtil det næste skærmbillede vises helt, før du fortsætter.
+YouAskToCreateDatabaseSoRootRequired=Du har markeret feltet "Opret database". Til dette skal du give login / adgangskode til superbrugeren (bunden af ​​formularen).
+YouAskToCreateDatabaseUserSoRootRequired=Du har markeret afkrydsningsfeltet "Opret database ejer". Til dette skal du give login / adgangskode til superbrugeren (bunden af ​​formularen).
+NextStepMightLastALongTime=Det nuværende trin kan tage flere minutter. Vent venligst, indtil næste skærm vises helt, inden du fortsætter.
 MigrationCustomerOrderShipping=Migræne shipping for kundeordrer opbevaring
 MigrationShippingDelivery=Opgrader opbevaring af skibsfart
 MigrationShippingDelivery2=Opgrader opbevaring af shipping 2
 MigrationFinished=Migrationen er afsluttet
-LastStepDesc=<strong>Sidste trin:</strong> Definer her login og adgangskode, du planlægger at bruge til at oprette forbindelse til software. Må ikke løse dette, da det er den konto, at administrere alle andre.
+LastStepDesc=<strong> Sidste trin </ strong>: Definer her login og adgangskode, du vil bruge til at oprette forbindelse til Dolibarr. <b> Mist ikke dette, da det er masterkontoen at administrere alle andre / ekstra brugerkonti. </ b>
 ActivateModule=Aktiver modul %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=Du bruger DoliWamp opsætningsguiden, så værdier foreslås her allerede er optimeret. Ændre dem kun, hvis du ved hvad du gør.
-KeepDefaultValuesDeb=Du bruger Dolibarr opsætningsguiden fra en Ubuntu eller Debian-pakke, så værdier, der foreslås her, er allerede optimeret. Kun den password i databasen ejeren for at oprette skal udfyldes. Ændre andre parametre kun hvis du ved hvad du gør.
-KeepDefaultValuesMamp=Du bruger DoliMamp opsætningsguiden, så værdier foreslås her allerede er optimeret. Ændre dem kun, hvis du ved hvad du gør.
-KeepDefaultValuesProxmox=Du bruger Dolibarr opsætningsguiden fra en Proxmox virtual appliance, så værdier, der foreslås her, allerede er optimeret. Skift dem kun hvis du ved hvad du gør.
-UpgradeExternalModule=Kør dedikeret opgradering af eksterne moduler
+WarningUpgrade=Advarsel:\nKørte du først en database backup?\nDette anbefales stærkt. Dataforløb (på grund af f.eks. Fejl i mysql version 5.5.40 / 41/42/43) kan være mulig under denne proces, så det er vigtigt at tage en komplet dump af din database, før du starter en migrering.\n\nKlik på OK for at starte overførselsprocessen ...
+ErrorDatabaseVersionForbiddenForMigration=Din database version er %s. Det har en kritisk fejl, der muliggør datatab, hvis du foretager strukturelle ændringer i din database, som det kræves af migrationsprocessen. Af hans grund vil migrering ikke blive tilladt, før du opgraderer din database til et lag (patched) version (liste over kendte buggy versioner: %s)
+KeepDefaultValuesWamp=Du brugte Dolibarr installationsguiden fra DoliWamp, så de her foreslåede værdier er allerede optimeret. Skift kun dem, hvis du ved hvad du laver.
+KeepDefaultValuesDeb=Du brugte Dolibarr installationsguiden fra en Linux-pakke (Ubuntu, Debian, Fedora ...), så de her foreslåede værdier er allerede optimeret. Kun adgangskoden til databaseejeren til oprettelse skal indtastes. Skift kun andre parametre, hvis du ved hvad du gør.
+KeepDefaultValuesMamp=Du brugte Dolibarr installationsguiden fra DoliMamp, så de her foreslåede værdier er allerede optimeret. Skift kun dem, hvis du ved hvad du laver.
+KeepDefaultValuesProxmox=Du brugte Dolibarr installationsguiden fra et Proxmox virtuelt apparat, så de her foreslåede værdier er allerede optimeret. Skift kun dem, hvis du ved hvad du laver.
+UpgradeExternalModule=Kør dedikeret opgraderingsproces af eksternt modul
 SetAtLeastOneOptionAsUrlParameter=Indstil mindst én mulighed som en parameter i URL. For eksempel: '... repair.php? Standard = bekræftet'
 NothingToDelete=Intet at rengøre / slette
 NothingToDo=Ingenting at lave
@@ -147,11 +148,11 @@ NothingToDo=Ingenting at lave
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for kundernes ordrer
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=Datamigrering for sælgerens ordrer
 MigrationProposal=Datamigration for tilbud
 MigrationInvoice=Data migration til kundernes fakturaer
 MigrationContract=Data migration for kontrakter
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade vellykket
 MigrationUpdateFailed=Mislykket Opgraderingsprocessen
 MigrationRelationshipTables=Data migration for forholdet tabeller (%s)
 MigrationPaymentsUpdate=Betaling data korrektion
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Kontrakt data korrektion
 MigrationContractsNumberToUpdate=%s kontrakt (er) for at opdatere
 MigrationContractsLineCreation=Opret kontrakt linje for kontrakten ref %s
 MigrationContractsNothingToUpdate=Ikke flere ting at gøre
-MigrationContractsFieldDontExist=Felt fk_facture ikke eksisterer længere. Intet at gøre.
+MigrationContractsFieldDontExist=Feltfk_facture eksisterer ikke længere. Ingenting at lave.
 MigrationContractsEmptyDatesUpdate=Kontrakt tomme dato korrektion
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Kontrakt tom datakorrektion udført med succes
 MigrationContractsEmptyDatesNothingToUpdate=Ingen kontrakt tomme tidspunkt til at korrigere
 MigrationContractsEmptyCreationDatesNothingToUpdate=Ingen kontrakt oprettelsesdato at korrigere
 MigrationContractsInvalidDatesUpdate=Bad valørdato kontrakt korrektion
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Levering opdatering
 MigrationStockDetail=Update materiel værdi af produkter
 MigrationMenusDetail=Update dynamiske menuer tabeller
 MigrationDeliveryAddress=Update leverings adresse i forsendelser
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors tabel
+MigrationProjectTaskActors=Dataoverførsel til tabel llx_projet_task_actors
 MigrationProjectUserResp=Data migration inden fk_user_resp af llx_projet til llx_element_contact
 MigrationProjectTaskTime=Update tid i sekunder
 MigrationActioncommElement=Opdatere data om tiltag
 MigrationPaymentMode=Data migration for betaling mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration af begivenheder, så begivenhedsejeren tilføjes tildelingstabel
-MigrationEventsContact=Migration af begivenheder for at tilføje eventkontakt i tildelingstabel
+MigrationEvents=Migrering af begivenheder for at tilføje eventejeren til opgavetabellen
+MigrationEventsContact=Migration af begivenheder for at tilføje eventkontakt til opgavebord
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserRightsEntity=Opdater enhedens feltværdi af llx_user_rights
+MigrationUserGroupRightsEntity=Opdater enhedens feltværdi af llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Nulstil modul BlockedLog for v7 algoritme
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ShowNotAvailableOptions=Vis utilgængelige muligheder
+HideNotAvailableOptions=Skjul utilgængelige muligheder
+ErrorFoundDuringMigration=Fejl (er) blev rapporteret under migrationsprocessen, så næste trin er ikke tilgængeligt. For at ignorere fejl kan du <a href="%s"> klikke her </a>, men programmet eller nogle funktioner fungerer muligvis ikke korrekt, før fejlene er løst.
+YouTryInstallDisabledByDirLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (mappen omdøbes med .lock-suffix). <br>
+YouTryInstallDisabledByFileLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (ved at der findes en låsfil <strong> install.lock </ strong> i dolibarr-dokumenter-mappen). <br>
+ClickHereToGoToApp=Klik her for at gå til din ansøgning
+ClickOnLinkOrRemoveManualy=Klik på følgende link. Hvis du altid ser den samme side, skal du fjerne / omdøbe filen install.lock i dokumentmappen.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 0f464995120..acebb62521c 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakter for denne tredjepart
 ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresse for denne tredjepart
 ActionsOnCompany=Begivenheder for denne tredjepart
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Begivenheder for denne medlem
 ActionsOnProduct=Begivenheder omkring dette produkt
 NActionsLate=%s sent
@@ -847,9 +848,9 @@ ModuleBuilder=Modulbygger
 SetMultiCurrencyCode=Indstil valuta
 BulkActions=Masse handlinger
 ClickToShowHelp=Klik for at vise værktøjs tips
-WebSite=Internet side
-WebSites=Websteder
-WebSiteAccounts=Webstedkonti
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Udgiftsrapport
 ExpenseReports=Udgiftsrapporter
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Udkast til masse slette bekræftelse
 FileSharedViaALink=Fil deles via et link
 SelectAThirdPartyFirst=Vælg en tredjepart først ...
 YouAreCurrentlyInSandboxMode=Du er i øjeblikket i %s "sandbox" -tilstanden
+Inventory=Beholdning
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 12befef61d6..a1753ae741a 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linket objekt
 NbOfActiveNotifications=Antal meddelelser (nr. Modtagers e-mails)
 PredefinedMailTest=__(Hej)__\nDette er en testpost sendt til __EMAIL__.\nDe to linjer er adskilt af en vognretur.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hej)__\nDette er en <b> test </ b> mail (ordtesten skal være fed skrift). De to linjer er adskilt af en vognretur. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hej)__\n\nVenligst find vedlagte faktura __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hej)__\n\nVi vil gerne advare dig om, at fakturaen __REF__ tilsyneladende ikke er blevet betalt. Fakturaen er vedlagt som en påmindelse.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hej)__\n\nSe venligst vedhæftet kommercielt forslag __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Opsætning af modulets hjemmeside
 WEBSITE_PAGEURL=URL til side
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Beskrivelse
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=nøgleord
 LinesToImport=Linjer at importere
diff --git a/htdocs/langs/da_DK/paybox.lang b/htdocs/langs/da_DK/paybox.lang
index cba36d2f7d5..79a1257db9e 100644
--- a/htdocs/langs/da_DK/paybox.lang
+++ b/htdocs/langs/da_DK/paybox.lang
@@ -3,15 +3,15 @@ PayBoxSetup=PayBox modul opsætning
 PayBoxDesc=Dette modul tilbyder sider at muliggøre betaling på <a href="http://www.paybox.com" target="_blank">Paybox</a> af kunderne. Dette kan bruges til en gratis betaling eller til en betaling på en bestemt Dolibarr genstand (faktura, ordre, ...)
 FollowingUrlAreAvailableToMakePayments=Følgende webadresser findes til at tilbyde en side til en kunde for at foretage en indbetaling på Dolibarr objekter
 PaymentForm=Betaling form
-WelcomeOnPaymentPage=Velkommen på vores online betalingstjenesten
+WelcomeOnPaymentPage=Velkommen til vores online betalingstjeneste
 ThisScreenAllowsYouToPay=Dette skærmbillede giver dig mulighed for at foretage en online-betaling til %s.
 ThisIsInformationOnPayment=Dette er informationer om betaling for at gøre
 ToComplete=For at fuldføre
 YourEMail=E-mail til bekræftelse af betaling,
 Creditor=Kreditor
 PaymentCode=Betaling kode
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
-ToPay=Må betaling
+PayBoxDoPayment=Betal med kredit eller betalingskort (Paybox)
+ToPay=Udfør betaling
 YouWillBeRedirectedOnPayBox=Du bliver omdirigeret om sikret Paybox siden til input du kreditkort informationer
 Continue=Næste
 ToOfferALinkForOnlinePayment=URL til %s betaling
@@ -19,20 +19,21 @@ ToOfferALinkForOnlinePaymentOnOrder=URL til at tilbyde en %s online betaling bru
 ToOfferALinkForOnlinePaymentOnInvoice=URL til at tilbyde en %s online betaling brugergrænseflade til en faktura
 ToOfferALinkForOnlinePaymentOnContractLine=URL til at tilbyde en %s online betaling brugergrænseflade til en kontrakt linje
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL til at tilbyde en %s online betaling brugergrænseflade til et frit beløb
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL til at tilbyde en %s online betaling brugergrænseflade til et medlem abonnement
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for at tilbyde en %s netbetalingsbrugergrænseflade via abonnement
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Du kan også tilføje webadresseparameter <b>& tag= <i>værdi</i></b> til nogen af disse URL (kræves kun for fri betaling) for at tilføje din egen betaling kommentere tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Opret din PayBox med <b>url %s</b> for at få betaling oprettes automatisk, når valideret af paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Opsæt din Paybox med url <b> %s </ b> for at få betaling oprettet automatisk, når den er godkendt af Paybox.
 YourPaymentHasBeenRecorded=Denne side bekræfter, at din betaling er registreret. Tak.
-YourPaymentHasNotBeenRecorded=Du betalingen ikke er blevet registreret, og transaktionen er blevet aflyst. Tak.
+YourPaymentHasNotBeenRecorded=Din betaling er IKKE blevet registreret, og transaktionen er blevet annulleret. Tak skal du have.
 AccountParameter=Konto parametre
 UsageParameter=Usage parametre
 InformationToFindParameters=Hjælp til at finde din %s kontooplysninger
 PAYBOX_CGI_URL_V2=URL PAYBOX CGI-modul til betaling
 VendorName=Navn på leverandør
 CSSUrlForPaymentForm=CSS stylesheet url til indbetalingskort
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+NewPayboxPaymentReceived=Ny Paybox modtaget
+NewPayboxPaymentFailed=Ny Paybox betaling forsøgt men mislykkedes
+PAYBOX_PAYONLINE_SENDEMAIL=E-mail for at advare efter en betaling (succes eller mislykket)
+PAYBOX_PBX_SITE=Værdi for PBX SITE
+PAYBOX_PBX_RANG=Værdi for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Værdi for PBX ID
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index 5f495cdafa9..32737446bff 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -9,7 +9,7 @@ PdfCommercialProposalTitle=Tilbud
 ProposalCard=Oversigt over tilbud
 NewProp=Nye tilbud
 NewPropal=Nyt tilbud
-Prospect=Prospect
+Prospect=Potentiel kunde
 DeleteProp=Slet tilbud
 ValidateProp=Godkend tilbud
 AddProp=Opret tilbud
@@ -33,7 +33,7 @@ PropalStatusSigned=Underskrevet (til bill)
 PropalStatusNotSigned=Ikke underskrevet (lukket)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Udkast
-PropalStatusValidatedShort=valideret
+PropalStatusValidatedShort=Bekræftet (åben)
 PropalStatusClosedShort=Lukket
 PropalStatusSignedShort=Underskrevet
 PropalStatusNotSignedShort=Ikke underskrevet
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s blev ikke fundet
 AddToDraftProposals=Tilføj skabelon
 NoDraftProposals=Ingen skabeloner
 CopyPropalFrom=Opret tilbud ved at kopiere eksisterende tilbud
-CreateEmptyPropal=Opret tomt tilbud eller fra listen med varer/ydelser
+CreateEmptyPropal=Opret tomt kommercielt forslag eller fra listen over produkter / tjenester
 DefaultProposalDurationValidity=Standard gyldighedstid for tilbud (i dage)
-UseCustomerContactAsPropalRecipientIfExist=Brug kundens kontaktadresse, hvis defineret i stedet for tredjepart-adresse som modtageradresse for tilbud
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klon tilbud
 ConfirmClonePropal=Er du sikker på, du vil klone tilbuddet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på du vil genåbne tilbuddet <b>%s</b>?
@@ -75,9 +75,10 @@ AvailabilityTypeAV_1M=1 måned
 TypeContact_propal_internal_SALESREPFOLL=Repræsentant for opfølgning af tilbud
 TypeContact_propal_external_BILLING=Kundefaktura kontakt
 TypeContact_propal_external_CUSTOMER=Kundekontakt for opfølgning af tilbud
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=Kundekontakt for levering
 # Document models
 DocModelAzurDescription=En komplet tilbudskabelon (logo. ..)
+DocModelCyanDescription=En komplet tilbudskabelon (logo. ..)
 DefaultModelPropalCreate=Oprettelse af skabelon
 DefaultModelPropalToBill=Skabelon, der skal benyttes, når et tilbud lukkes (med fakturering)
 DefaultModelPropalClosed=Skabelon, der skal benyttes, når et tilbud lukkes (uden fakturering)
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 3e1955ef236..e8d3a98377d 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kode
-WebsiteSetupDesc=Opret her så meget adgang som antallet af forskellige hjemmesider, du har brug for. Gå derefter ind i menuen Websites for at redigere dem.
+WebsiteSetupDesc=Opret her de websteder, du vil bruge. Gå derefter ind i menuen Websites for at redigere dem.
 DeleteWebsite=Slet websted
-ConfirmDeleteWebsite=Er du sikker på, at du vil slette dette websted. Alle dens sider og indhold vil også blive fjernet.
+ConfirmDeleteWebsite=Er du sikker på, at du vil slette dette websted? Alle dens sider og indhold vil også blive fjernet.
 WEBSITE_TYPE_CONTAINER=Type side / container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGE_EXAMPLE=Webside til brug som eksempel
 WEBSITE_PAGENAME=Sidens navn / alias
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALT=Alternative sidenavne / aliaser
+WEBSITE_ALIASALTDesc=Brug her en liste over andre navne / aliaser, så siden kan også fås ved hjælp af disse andre navne / aliaser (for eksempel det gamle navn efter omdøbning af aliaset for at holde tilbagekobling på gamle link / navnearbejde). Syntaks er: <br> alternativnavn1, alternativnavn2, ...
 WEBSITE_CSS_URL=URL for ekstern CSS-fil
 WEBSITE_CSS_INLINE=CSS-fil indhold (fælles for alle sider)
 WEBSITE_JS_INLINE=Javascript fil indhold (fælles for alle sider)
 WEBSITE_HTML_HEADER=Tilføjelse nederst på HTML-overskrift (fælles for alle sider)
 WEBSITE_ROBOT=Robotfil (robots.txt)
-WEBSITE_HTACCESS=Websted. Htaccess-fil
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML-overskrift (kun for denne side)
 PageNameAliasHelp=Navnet eller aliaset på siden. <br> Dette alias bruges også til at oprette en SEO-URL, når webstedet er kørt fra en virtuel vært på en webserver (som Apacke, Nginx, ...). Brug knappen "<strong> %s </strong>" for at redigere dette alias.
 EditTheWebSiteForACommonHeader=Bemærk: Hvis du vil definere en personlig "Header" for alle sider, skal du redigere din "Header" på website niveau i stedet for på siden / containeren.
 MediaFiles=Mediebibliotek
-EditCss=Rediger Style / CSS eller HTML header
+EditCss=Rediger webstedets egenskaber
 EditMenu=Rediger menu
 EditMedias=Rediger medier
-EditPageMeta=Rediger Meta
+EditPageMeta=Rediger side / container egenskaber
+EditInLine=Rediger inline
 AddWebsite=Tilføj hjemmeside
 Webpage=Webside / container
 AddPage=Tilføj side / container
 HomePage=Hjemmeside
 PageContainer=Side / beholder
-PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </strong> endnu ikke tilgængeligt. Du skal først tilføje en side.
+PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </ strong> endnu ikke tilgængeligt. Du skal først <strong> Importer en fuld hjemmeside skabelon </ strong> 'eller bare <strong> Tilføj en side / container </ strong>'.
 RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette.
+SiteDeleted=Webstedet '%s' slettet
 PageContent=Side / Indhold
 PageDeleted=Side / Indenhold '%s' af hjemmesiden %s slettet
 PageAdded=Side / Indhold '%s' tilføjet
@@ -36,49 +39,57 @@ ViewPageInNewTab=Se side i ny fane
 SetAsHomePage=Angiv som hjemmeside
 RealURL=Rigtig webadresse
 ViewWebsiteInProduction=Se websitet ved hjælp af hjemmesider
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+SetHereVirtualHost=<u> Brug med Apache / NGinx /...</ u> <br> Hvis du kan oprette en dedikeret Virtual Host med PHP aktiveret og en Root-mappe på din webserver (Apache, Nginx, ...) <br> <strong> %s </ strong> Skriv derefter her det virtuelle værtsnavn, du har oprettet, så forhåndsvisningen kan også gøres ved hjælp af denne dedikerede webserveradgang i stedet for kun at bruge Dolibarr-serveren.
+YouCanAlsoTestWithPHPS=<u> Brug med PHP-integreret server </ u> <br> På udvikler miljø kan du helst prøve webstedet med den indbyggede PHP-server (PHP 5.5 påkrævet) ved at køre <br> <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
+CheckVirtualHostPerms=Kontroller også, at den virtuelle vært har tilladelse <strong> %s </strong> på filer til <br> <strong> %s</strong>
 ReadPerm=Læs
-WritePerm=Write
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+WritePerm=Skriv
+PreviewSiteServedByWebServer=<u> Se %s i en ny fane. </u> <br> <br> %s vil blive serveret af en ekstern webserver (som Apache, Nginx, IIS). Du skal installere og konfigurere denne server før du peger på biblioteket: <br> <strong> %s </strong> <br> URL serveret af ekstern server: <br> <strong> %s </strong>
+PreviewSiteServedByDolibarr=<u> Preview %s i en ny fane. </ u> <br> <br> %s vil blive serveret af Dolibarr server, så det behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS), der skal installeres. < br> Ubelejligt er, at webadressen på sider ikke er brugervenlige og begynder med din Dolibarr-sti. <br> URL betjent af Dolibarr: <br> <strong> %s </ strong> <br> <br> Sådan bruger du din egen ekstern webserver til at tjene dette websted, opret en virtuel vært på din webserver, der peger på biblioteket <br> <strong> %s </ strong>, og indtast derefter navnet på denne virtuelle server og klik på den anden preview-knap .
 VirtualHostUrlNotDefined=URL til den virtuelle vært, der serveres af en ekstern webserver, der ikke er defineret
 NoPageYet=Ingen sider endnu
+YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Klon side / container
 CloneSite=Klon website
-SiteAdded=Websted tilføjet
+SiteAdded=Website added
 ConfirmClonePage=Indtast venligst kode / alias for ny side, og hvis det er en oversættelse af den klonede side.
 PageIsANewTranslation=Den nye side er en oversættelse af den aktuelle side?
 LanguageMustNotBeSameThanClonedPage=Du klon en side som en oversættelse. Sproget på den nye side skal være anderledes end sproget på kildesiden.
 ParentPageId=Forældre side id
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Opret side / container ved at hente side fra ekstern webadresse ...
-OrEnterPageInfoManually=Eller opret en tom side fra bunden ...
+OrEnterPageInfoManually=Eller opret side fra bunden eller fra en sideskabelon ...
 FetchAndCreate=Hent og Opret
-ExportSite=Eksport sted
+ExportSite=Eksporter hjemmeside
+ImportSite=Importer websider skabelon
 IDOfPage=Side Id
 Banner=Banner
 BlogPost=Blogindlæg
-WebsiteAccount=Websted konto
-WebsiteAccounts=Webstedkonti
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Opret websitet konto
 BackToListOfThirdParty=Tilbage til listen for tredjepart
 DisableSiteFirst=Deaktiver hjemmesiden først
 MyContainerTitle=Min hjemmeside titel
 AnotherContainer=En anden beholder
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
+WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivér webstedets kontobord
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivér tabellen til at gemme websitekonti (login / pass) for hver hjemmeside / tredjepart
+YouMustDefineTheHomePage=Du skal først definere standard startside
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+OnlyEditionOfSourceForGrabbedContent=Kun udgave af HTML-kilde er mulig, når indhold blev taget fra et eksternt websted
+GrabImagesInto=Grib også billeder fundet i css og side.
+ImagesShouldBeSavedInto=Billeder skal gemmes i biblioteket
+WebsiteRootOfImages=Rodbibliotek for website billeder
+SubdirOfPage=Underkatalog dedikeret til side
+AliasPageAlreadyExists=Alias ​​side <strong> %s </strong>eksisterer allerede
+CorporateHomePage=Firmahjemmeside
+EmptyPage=Tom side
+ExternalURLMustStartWithHttp=Ekstern webadresse skal starte med http: // eller https: //
+ZipOfWebsitePackageToImport=Zip-fil af webstedspakke
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Intern webadresse for siden
+ThisPageIsTranslationOf=Denne side / container er oversættelse af
+ThisPageHasTranslationPages=Denne side / container har oversættelse
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index ae7e179549d..fb6d7d9959d 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -233,8 +233,6 @@ ActualizeCurrency=Aktualisiere Währung
 SetMultiCurrencyCode=Setze Währung
 BulkActions=Stapelverarbeitungen
 ClickToShowHelp=Clicke hier für Kontexthilfe.
-WebSite=Website
-WebSites=Webseiten
 WebSiteAccounts=Webseitenkonten
 ExpenseReports=Spesenrapporte
 AutomaticallyCalculated=Automatisch generiert
diff --git a/htdocs/langs/de_CH/propal.lang b/htdocs/langs/de_CH/propal.lang
index 340b40282f5..a20eea1d33d 100644
--- a/htdocs/langs/de_CH/propal.lang
+++ b/htdocs/langs/de_CH/propal.lang
@@ -7,6 +7,5 @@ DefaultProposalDurationValidity=Standardmässige Gültigkeitsdatuer (Tage)
 UseCustomerContactAsPropalRecipientIfExist=Falls vorhanden die Adresse des Kundenkontakts statt des Geschäftspartners verwenden
 AvailabilityPeriod=Verfügbarkeitszeitraum
 SetAvailability=Verfügbarkeitszeitraum definieren
-TypeContact_propal_external_CUSTOMER=Kundenkontakt für Angebot
 DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schliessen wollen (zur Verrechung)
 DefaultModelPropalClosed=Standard-Template, wenn sie ein Angebot schliessen wollen (ohne Rechnung)
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 315bf621265..5141a39d95d 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Suche externe Module
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-Module Werkzeuge
 ModuleFamilyExperimental=Experimentelle Module
 ModuleFamilyFinancial=Finanzmodule (Rechnungswesen/Finanzen)
 ModuleFamilyECM=Inhaltsverwaltung (ECM)
-ModuleFamilyPortal=Websites und weitere Frontal-Anwendung
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Schnittstellen zu externen Systemen
 MenuHandlers=Menü-Handler
 MenuAdmin=Menü-Editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Klicke um die Beschreibung zu sehen
 DependsOn=Diese Modul benötigt die folgenden Module
 RequiredBy=Diese Modul wird durch folgende Module verwendet
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>Formular um einen neuen Partner zu erstellen ist <strong>%s</strong>,<br>Fall Sie Vorgabewerte via URL angeben wollen, können Sie <strong>%s</strong> verwenden
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Persönliche Standardwerte erlauben
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Benutzer & Gruppen
 Module0Desc=Benutzer / Mitarbeiter und Gruppen Administration
 Module1Name=Partner
-Module1Desc=Partner- und Kontakteverwaltung
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Vertrieb
 Module2Desc=Vertriebsverwaltung
 Module10Name=Buchhaltung
@@ -501,7 +501,7 @@ Module23Desc=Überwachung des Energieverbrauchs
 Module25Name=Kundenaufträge
 Module25Desc=Kundenauftragsverwaltung
 Module30Name=Rechnungen
-Module30Desc=Rechnungs- und Gutschriftsverwaltung für Kunden. Rechnungsverwaltung für Lieferanten
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Lieferanten
 Module40Desc=Lieferanten und Einkaufsverwaltung (Bestellungen und Lieferantenrechnungen)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=USt.-Sätze
 DictionaryRevenueStamp=Steuermarken Beträge
 DictionaryPaymentConditions=Zahlungsbedingungen
 DictionaryPaymentModes=Zahlungsarten
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Art der Webseite Seiten/Container
 DictionaryEcotaxe=Ökosteuern (WEEE)
 DictionaryPaperFormat=Papierformate
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf V
 LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den Code vorhanden ist.
 LabelOnDocuments=Bezeichnung auf Dokumenten
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Am Ende des Monats
 CurrentNext=Aktueller/ Nächster
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Protokollierte Ereignisse
-Audit=Protokoll
+Audit=Security events
 InfoDolibarr=Über Dolibarr
 InfoBrowser=Über Webbrowser
 InfoOS=Betriebsysteminfos
@@ -1065,7 +1066,7 @@ BrowserName=Browser Name
 BrowserOS=Betriebssystem des Browsers
 ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
 SecurityEventsPurged=Security-Ereignisse gelöscht
-LogEventDesc=Hier können Sie die Protokollierungseinstellungen für sicherheitsrelevante Ereignisse anpassen. Administratoren können die entsprechenden Inhalte unter <b>Systemwerkzeuge-Protokoll</b> einsehen. Achtung: Diese Funktion kann zu erhöhtem Datenaufkommen in der Datenbank führen.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> verändert werden.
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (Für Länder in denen nicht auf 10er
 UnitPriceOfProduct=Nettostückpreis
 TotalPriceAfterRounding=Gesamtpreis (Netto/USt./Brutto) gerundet
 ParameterActiveForNextInputOnly=Die Einstellungen werden erst bei der nächsten Eingabe wirksam
-NoEventOrNoAuditSetup=Keine sicherheitsrelevanten Protokollereignisse. Überprüfen Sie die Aktivierung dieser Funktionen unter 'Einstellungen-Sicherheit-Protokoll'.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Lokale sendmail-Einstellungen anzeigen
 BackupDesc=Um eine vollständige Systemsicherung durchzuführen müssen Sie:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Zusätzliche Attribute (Rechnungsvorlage, Zeilen)
 ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellposition)
 ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile)
 ExtraFieldsThirdParties=Ergänzende Attribute (Partner)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Ergänzende Attribute (Mitglied)
 ExtraFieldsMemberType=Ergänzende Attribute (Mitglied)
 ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Liste der Benachrichtigungen nach Benutzer*
 ListOfNotificationsPerUserOrContact=Liste der Benachrichtigungen nach Benutzer oder Kontakt**
 ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
 GoOntoUserCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" eines Benutzers, um Benachrichtigungen für Benutzer zu erstellen/entfernen
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" des Partners, um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
 Threshold=Schwellenwert
 BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=PLZ
 ##### Resource ####
 ResourceSetup=Konfiguration des Modul Ressourcen
 UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 253ced36e39..9937e762242 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Bank | Cash
+MenuBankCash=Bank | Bargeld
 MenuVariousPayment=Sonstige Zahlungen
 MenuNewVariousPayment=Neue sonstige Zahlung
 BankName=Name der Bank
@@ -12,7 +12,7 @@ ShowAccount=Zeige Konto
 AccountRef=Buchhaltungs-Konto Nr.
 AccountLabel=Buchhaltungs-Konto Nr.
 CashAccount=Konto Kassa
-CashAccounts=Kassen
+CashAccounts=Bargeldkonten
 CurrentAccounts=Girokonten
 SavingAccounts=Sparkonten
 ErrorBankLabelAlreadyExists=Kontenbezeichnung existiert bereits
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Kontoadresse
 BankAccountCountry=Bankkonto Land
 BankAccountOwner=Kontoinhaber
 BankAccountOwnerAddress=Kontoinhaber-Adresse
-RIBControlError=Prüfung auf Vollständigkeit fehlgeschlagen. Informationen zu Bankkonto sind nicht vollständig oder falsch (Land überprüfen, Zahlen und IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Konto erstellen
 NewBankAccount=Neues Konto
 NewFinancialAccount=Neues Finanzkonto
@@ -76,6 +76,7 @@ TransactionsToConciliate=Transaktionen zum ausgleichen
 Conciliable=kann ausgeglichen werden
 Conciliate=Ausgleichen
 Conciliation=Ausgleich
+SaveStatementOnly=Nur Buchung speichern
 ReconciliationLate=Zahlungsausgleich spät
 IncludeClosedAccount=Geschlossene Konten miteinbeziehen
 OnlyOpenedAccount=Nur offene Konten
@@ -104,7 +105,7 @@ SocialContributionPayment=Zahlung von Sozialabgaben/Steuern
 BankTransfer=Kontentransfer
 BankTransfers=Kontentransfers
 MenuBankInternalTransfer=interner Transfer
-TransferDesc=Von einem zum anderen Konto übertragen. Dolibarr wird zwei Buchungen erstellen - Debit in der Quell- und Credit im Zielkonto. (Identischer Betrag (bis auf das Vorzeichen), Beschreibung und Datum werden benutzt)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Von
 TransferTo=An
 TransferFromToDone=Eine Überweisung <b>von %s nach %s iHv %s %s</b> wurde verbucht.
@@ -132,11 +133,11 @@ PaymentDateUpdateSucceeded=Zahlungsdatum erforlgreich aktualisiert
 PaymentDateUpdateFailed=Zahlungsdatum konnte nicht aktualisiert werden
 Transactions=Transaktionen
 BankTransactionLine=Bank-Transaktionen
-AllAccounts=All bank and cash accounts
+AllAccounts=Alle Finanzkonten
 BackToAccount=Zurück zum Konto
 ShowAllAccounts=Alle Finanzkonten
-FutureTransaction=Zukünftige Transaktionen.
-SelectChequeTransactionAndGenerate=Schecks auswählen/filtern um Sie in den Einzahlungsbeleg zu integrieren und auf "Erstellen" klicken.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlung übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, in der die Daten eingeordnet werden
 ToConciliate=auszugleichen ?
@@ -153,7 +154,7 @@ RejectCheckDate=Datum an dem der Scheck zurückgewiesen wurde
 CheckRejected=Scheck zurückgewiesen
 CheckRejectedAndInvoicesReopened=Scheck zurückgewiesen und Rechnungen wieder geöffnet
 BankAccountModelModule=Dokumentvorlagen für Bankkonten
-DocumentModelSepaMandate=Vorlage für SEPA Mandate. Nur sinnvoll in Ländern der EU.
+DocumentModelSepaMandate=Vorlage für SEPA Mandate. Nur sinnvoll in EU Ländern.
 DocumentModelBan=Template für den Druck von Seiten mit Bankkonto-Nummern Eintrag.
 NewVariousPayment=Neue sonstige Zahlungen
 VariousPayment=Sonstige Zahlungen
@@ -162,4 +163,6 @@ ShowVariousPayment=Zeige sonstige Zahlungen
 AddVariousPayment=Sonstige Zahlung hinzufügen
 SEPAMandate=SEPA Mandat
 YourSEPAMandate=Ihr SEPA-Mandat
-FindYourSEPAMandate=Dies ist Ihr SEPA-Auftrag, um unser Unternehmen zu autorisieren, einen Lastschriftauftrag an Ihre Bank zu erteilen. Bitte senden Sie dieses Formular unterschrieben an uns zurück (Scan des signierten Dokuments per Email) oder senden Sie es per Post an
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index ec2b27d0943..4d139451fe2 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -465,7 +465,7 @@ Cheques=Schecks
 DepositId=Scheck Nr.
 NbCheque=Schecknummer
 CreditNoteConvertedIntoDiscount=Diese Gutschrift %s wurde in %s umgewandelt
-UsBillingContactAsIncoiveRecipientIfExist=Verwenden Sie Kunden Abrechnung Kontakt-Adresse anstelle von Dritten als Empfänger-Adresse für Rechnungen
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Zeige alle unbezahlten Rechnungen
 ShowUnpaidLateOnly=Zeige nur verspätete unbezahlte Rechnung
 PaymentInvoiceRef=Die Zahlung der Rechnung %s
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 39b5daa27d3..37ace689d44 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -1,6 +1,6 @@
 # Language file - Source file is en_US - cashdesk
 CashDeskMenu=POS Kasse
-CashDesk=Kasse
+CashDesk=Verkaufsstelle
 CashDeskBankCash=Bankkonto (Bargeld)
 CashDeskBankCB=Bankkonto (Kartenzahlung)
 CashDeskBankCheque=Bankkonto(Scheckzahlung)
@@ -30,5 +30,15 @@ ShowCompany=Zeige Unternehmen
 ShowStock=Zeige Lager
 DeleteArticle=Klicken, um diesen Artikel zu entfernen
 FilterRefOrLabelOrBC=Suche (Art-Nr./Name)
-UserNeedPermissionToEditStockToUsePos=Sie bitten, ab dem Rechnungserstellung zu verringern, so dass Benutzer, die POS verwenden müssen, um die Erlaubnis, Lager zu bearbeiten.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Quittungsdrucker
+PointOfSale=Kassen
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Etage
+AddTable=Tisch hinzufügen
+Place=Platz
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Bondrucker
+SearchProduct=Produkt suchen
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 8c85297f506..a6bff185467 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Vertrieb
+Commercial=Einkauf | Vertrieb
 CommercialArea=Vertrieb - Übersicht
 Customer=Kunde
 Customers=Kunden
 Prospect=Lead
 Prospects=Leads
 DeleteAction=Löschen eines Ereignis
-NewAction=Neue/r Termin/Aufgabe
+NewAction=erstelle Termin/Aufgabe
 AddAction=Termin/Aufgabe erstellen
 AddAnAction=Erstelle Termin/Aufgabe
 AddActionRendezVous=erstelle Termin
-ConfirmDeleteAction=Möchten Sie diese Veranstaltung wirklich löschen ?
+ConfirmDeleteAction=Dieses Ereignis wirklich löschen ?
 CardAction=Ereignis - Karte
 ActionOnCompany=Verknüpftes Unternehmen
 ActionOnContact=Verknüpfter Kontakt
@@ -38,7 +38,7 @@ SendPropalRef=Einreichung der Angebote %s
 SendOrderRef=Einreichung der Bestellung %s
 StatusNotApplicable=Nicht anwendbar
 StatusActionToDo=Zu erledigen
-StatusActionDone=Abgeschlossen
+StatusActionDone=erledigt
 StatusActionInProcess=In Bearbeitung
 TasksHistoryForThisContact=Ereignisse zu diesem Kontakt
 LastProspectDoNotContact=Nicht kontaktieren
@@ -52,16 +52,17 @@ ActionAC_TEL=Anruf
 ActionAC_FAX=Fax versenden
 ActionAC_PROP=Angebot senden
 ActionAC_EMAIL=E-Mail senden
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Termine
 ActionAC_INT=Serviceaufträge vor Ort
 ActionAC_FAC=Kundenrechnung senden
-ActionAC_REL=Kundenrechnung senden(Erinnerung)
-ActionAC_CLO=Schließen
+ActionAC_REL=Kundenrechnung senden  (Erinnerung)
+ActionAC_CLO=schließen
 ActionAC_EMAILING=E-Mail-Kampagne starten
 ActionAC_COM=Sende Bestellung per Post
 ActionAC_SHIP=Lieferschein senden
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Lieferantenbestellung per E-Mail versenden
+ActionAC_SUP_INV=Lieferanten-Rechnung per E-Mail versenden
 ActionAC_OTH=Sonstiges
 ActionAC_OTH_AUTO=Automatisch eingefügte Ereignisse
 ActionAC_MANUAL=Manuell eingefügte Ereignisse
@@ -72,8 +73,8 @@ StatusProsp=Lead Status
 DraftPropals=Entworfene Angebote
 NoLimit=Kein Limit
 ToOfferALinkForOnlineSignature=Link zur Onlinesignatur
-WelcomeOnOnlineSignaturePage=Wilkommen auf der Seite um die Angebote von %s zu akzeptieren
+WelcomeOnOnlineSignaturePage=Wilkommen auf der Seite um Angebote von %s zu akzeptieren
 ThisScreenAllowsYouToSignDocFrom=Auf dieser Seite können Angebote akzeptiert und unterschreiben oder ablehnt werden
 ThisIsInformationOnDocumentToSign=Information zum Dokument zum Akzeptieren oder Ablehnen
 SignatureProposalRef=Unterschrift des Angebotes %s
-FeatureOnlineSignDisabled=Onlineunterschrift ist deaktiviert oder das Dokument wurde erstellt, bevor dieses Funktion aktiviert wurde
+FeatureOnlineSignDisabled=Onlineunterschrift ist deaktiviert oder das Dokument wurde erstellt, bevor diese Funktion aktiviert wurde
diff --git a/htdocs/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang
index 7be111dc08c..8facb478666 100644
--- a/htdocs/langs/de_DE/dict.lang
+++ b/htdocs/langs/de_DE/dict.lang
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Nordkorea
 CountryKR=Südkorea
 CountryKW=Kuwait
-CountryKG=Kirgisien
+CountryKG=Kirgisistan
 CountryLA=Laos
 CountryLV=Lettland
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavien
 CountryMN=Mongolei
 CountryMS=Montserrat
 CountryMZ=Mosambik
-CountryMM=Myanmar
+CountryMM=Mianmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -277,7 +277,7 @@ CurrencySingMGA=Madagassisches Ariary
 CurrencyMUR=Mauritius Rupien
 CurrencySingMUR=Mauritius Rupie
 CurrencyNOK=Norwegische Kronen
-CurrencySingNOK=Norwegische Krone
+CurrencySingNOK=Norwegische Kronen
 CurrencyTND=Tunesischer Dinar
 CurrencySingTND=Tunesische Dinar
 CurrencyUSD=US Dollar
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Mund-zu-Mund-Propaganda
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Angestellter
 DemandReasonTypeSRC_SPONSORING=Sponsoring
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index ebdd567ea31..976e09fdf1d 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Anzahl Dokumente im Verzeichnis
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Verzeichnis
 ECMSectionManual=Manueller Ordner
 ECMSectionAuto=Automatischer Ordner
@@ -17,7 +17,7 @@ ECMCreationUser=Autor
 ECMArea=DMS/CMS Bereich
 ECMAreaDesc=Das ECM (Electronic Content Management)-System erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von Dokumenten.
 ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen.
-ECMSectionWasRemoved=Ordner <b>%s</b> wurde gelöscht.
+ECMSectionWasRemoved=Verzeichnis <b>%s</b> wurde gelöscht.
 ECMSectionWasCreated=Verzeichnis <b>%s</b> wurde erstellt.
 ECMSearchByKeywords=Suche nach Stichwörtern
 ECMSearchByEntity=Suche nach Objekt
@@ -34,18 +34,19 @@ ECMDocsByProjects=Mit Projekten verknüpfte Dokumente
 ECMDocsByUsers=Mit Benutzern verknüpfte Dokumente
 ECMDocsByInterventions=Mit Serviceaufträgen verknüpfte Dokumente
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Noch kein Ordner erstellt
 ShowECMSection=Ordner anzeigen
 DeleteSection=Verzeichnis löschen
 ConfirmDeleteSection=Möchten Sie dieses Verzeichnis <b>%s</b> wirklich löschen?
 ECMDirectoryForFiles=Relatives Verzeichnis für Dateien
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Entfernen nicht möglich, da es Dateien oder Unterverzeichnisse enthält
+CannotRemoveDirectoryContainsFiles=Entfernen nicht möglich, da es Dateien enthält
 ECMFileManager=Dateiverwaltung
 ECMSelectASection=Wähle einen Ordner aus der Baumansicht...
 DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint außerhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssten auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank zu synchronisieren.
 ReSyncListOfDir=Liste der Verzeichnisse nochmals synchronisieren
 HashOfFileContent=Hashwert der Datei
-FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (Datei nochmals hochladen)
-FileSharedViaALink=Datei via Link geteilt
 NoDirectoriesFound=Keine Verzeichnisse gefunden
+FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (Datei nochmals hochladen)
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 13d52783b6a..f9bfc74f99d 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP Client fehlgeschlagen mit Fehler '%s'
 ErrorGlobalVariableUpdater5=Keine globale Variable ausgewählt
 ErrorFieldMustBeANumeric=Feld <b>%s</b> muss ein numerischer Wert sein
 ErrorMandatoryParametersNotProvided=Erforderliche(r) Parameter wird nicht angeboten
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Moduldeskriptor für Klasse %s konnte nicht geladen werden
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Falsche Definition von Menü Array in  Module Descriptor (falscher Wert für den Key  fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=Der Produktbarcode %sexistiert schon bei einer
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Das verwenden von virtuellen Produkten welche den Lagerbestand von Unterprodukten verändern ist nicht möglich, wenn ein Unterprodukt (Oder Unter-Unterprodukt) eine Seriennummer oder Chargennummer benötigt.
 ErrorDescRequiredForFreeProductLines=Beschreibung ist erforderlich für freie Produkte
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
 WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
diff --git a/htdocs/langs/de_DE/help.lang b/htdocs/langs/de_DE/help.lang
index 7d93a8c6bfe..740c521309f 100644
--- a/htdocs/langs/de_DE/help.lang
+++ b/htdocs/langs/de_DE/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Fernwartungs-Support
 OtherSupport=Weitere Unterstützung
 ToSeeListOfAvailableRessources=Hier sehen Sie die verfügbaren Ressourcen:
 HelpCenter=Hilfe-Center
-DolibarrHelpCenter=Hilfe- und Supportcenter
-ToGoBackToDolibarr=Andernfalls klicken Sie <a href="%s">hier um zum System</a> zurückzukehren
-TypeOfSupport=Support-Typ
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (kostenlos)
 TypeSupportCommercial=Kommerzieller Support
 TypeOfHelp=Hilfe-Typ
@@ -15,12 +15,9 @@ NeedHelpCenter=Benötigen Sie Hilfe oder Unterstützung?
 Efficiency=Effizienz
 TypeHelpOnly=Ausschließlich Hilfe
 TypeHelpDev=Hilfe & Entwicklung
-TypeHelpDevForm=Hilfe&Entwicklung&Ausbildung
-ToGetHelpGoOnSparkAngels1=Einige Unternehmen bieten eine schnelle (manchmal prompte) und effiziente Online-Unterstützung durch Fernwartung. Solche Helfer finden Sie auf dieser Website <b>%s</b>
-ToGetHelpGoOnSparkAngels3=Über einen Klick auf diese Schaltfläche erhalten Sie eine Liste aller verfügbaren Trainer für das System
-ToGetHelpGoOnSparkAngels2=Gelegentlich ist zum Zeitpunkt Ihrer Suche vielleicht kein Partner verfügbar. Denken Sie daran, den Filter auf "Alle verfügbaren" zu setzen. So können Sie mehr Anfragen stellen.
-BackToHelpCenter=Klicken Sie hier um zur <a href="%s">Hilfeseite</a> zurückzukehren.
-LinkToGoldMember=Sie können einen, vom System für Ihre Sprache (%s) automatisch ausgewählten, Trainer über einen Klick auf sein Widget kontaktieren (Status und Maximalpreis aktualisieren sich automatisch):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Unterstützte Sprachen
-SubscribeToFoundation=Helfen auch Sie dem Dolibarr Projekt und unterstützen uns mit einer Abo-Spende.
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Für offizielle Dolibarr Unterstützung in Ihrer Sprache: br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 0714b729c3f..4a458b7f9d3 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -4,7 +4,7 @@ Holidays=Urlaub
 CPTitreMenu=Urlaub
 MenuReportMonth=Monatsaufstellung
 MenuAddCP=Neuer Urlaubsantrag
-NotActiveModCP=Sie müssen das Urlaubsmodul aktivieren um diese Seite zu sehen.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Erstellen Sie ein Urlaubs-Antrag
 DateDebCP=Urlaubsbeginn
 DateFinCP=Urlaubsende
@@ -15,18 +15,18 @@ ApprovedCP=genehmigt
 CancelCP=Storniert
 RefuseCP=abgelehnt
 ValidatorCP=Genehmiger
-ListeCP=Urlaubsliste
+ListeCP=List of leave
 LeaveId=Urlaubs ID
 ReviewedByCP=Wird geprüft von
 UserForApprovalID=Benutzer für die Genehmigungs-ID
-UserForApprovalFirstname=Vorname des Genehmigers
-UserForApprovalLastname=Nachname des Genehmigers
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login des Genehmigers
 DescCP=Beschreibung
 SendRequestCP=Erstelle Urlaubs-Antrag
 DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
-MenuConfCP=Summe der Abwesenheitsanträge
-SoldeCPUser=Urlaubssaldo ist <b>%s</b> Tage.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Sie müssen ein Urlaubsende-Datum wählen, dass nach dem Urlaubsbeginn-Datum liegt.
 ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Erstellung von:
 ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
@@ -39,10 +39,10 @@ TypeOfLeaveId=Art der Urlaubs-ID
 TypeOfLeaveCode=Art des Urlaubscodes
 TypeOfLeaveLabel=Art des Urlaubslabels
 NbUseDaysCP=Anzahl von konsumierten Tagen des Urlaubs
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPShort=Tage verbraucht
+NbUseDaysCPShortInMonth=Tage im Monat verbraucht
+DateStartInMonth=Startdatum im Monat
+DateEndInMonth=Enddatum im Monat
 EditCP=Bearbeiten
 DeleteCP=Lösche Gruppe
 ActionRefuseCP=Ablehnen
@@ -98,11 +98,11 @@ HalfDay=Halber Tag
 NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
 LEAVE_PAID=bezahlter Urlaub
 LEAVE_SICK=Krankheitstag
-LEAVE_OTHER=Other leave
+LEAVE_OTHER=Andere Gründe
 LEAVE_PAID_FR=bezahlter Urlaub
 ## Configuration du Module ##
-LastUpdateCP=Letzte automatische Aktualisierung der Urlaubstage
-MonthOfLastMonthlyUpdate=Monat der letzten Aktualisierung der Urlaubstage
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Erfolgreich bearbeitet.
 Module27130Name= Verwaltung von Urlaubsanträgen
 Module27130Desc= Verwaltung von Urlaubsanträgen
@@ -112,7 +112,7 @@ NoticePeriod=Kündigungsfrist
 HolidaysToValidate=Genehmige Urlaubsanträge
 HolidaysToValidateBody=Es folgt ein Urlaubsantrag zur Freigabe
 HolidaysToValidateDelay=Dieser Urlaub wird in weniger als %s Tagen stattfinden.
-HolidaysToValidateAlertSolde=Der Ersteller dieses Urlaubsantrags besitzt nicht mehr genügend verfügbare Tage.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Genehmigte Urlaubsanträge
 HolidaysValidatedBody=Ihr Antrag auf Urlaub von %s bis %s wurde bewilligt.
 HolidaysRefused=Anfrage abgelehnt
@@ -121,4 +121,9 @@ HolidaysCanceled=stornierter Urlaubsantrag
 HolidaysCanceledBody=Ihr Urlaubsantrag von %s bis %s wurde storniert.
 FollowedByACounter=1: Diese Art von Antrag muss mit einem Zähler versehen werden. Der Zähler wird manuell oder automatisch erhöht und verringert, wenn der Urlaubsantrag geprüft wurde.<br>0: nicht mit einem Zähler versehen
 NoLeaveWithCounterDefined=Es gibt keine definierten Antragsarten , die mit einem Zähler versehen werden müssen.
-GoIntoDictionaryHolidayTypes=Öffnen Sie das Menü <strong>Start - Einstellungen - Stammdaten - Arten des Urlaubs </strong> um die verschiedene Urlaubsarten zu konfigurieren.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 4c828c1eaef..2c16132a064 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Beachten Sie einfach die folgenden Schritte.
 MiscellaneousChecks=Systemvoraussetzungen prüfen
 ConfFileExists=Die Konfigurationsdatei <b>%s</b> ist vorhanden.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Die Konfigurationsdatei <b>%s</b> ist nicht vorhanden und konnte auch nicht erstellt werden!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Die Konfigurationsdatei <b>%s</b> wurde erfolgreich erstellt.
-ConfFileIsNotWritable=Die Konfigurationsdatei <b>%s</b> ist nicht beschreibbar. Bitte überprüfen Sie die Dateizugriffsrechte. Für die Erstinstallation muss Ihr Webserver in die Konfigurationsdatei schreiben können, setzen Sie die Dateiberechtigungen entsprechend (z.B. mittels "chmod 666" auf Unix-Betriebssystemen).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Die Konfigurationsdatei <b>%s</b> ist beschreibbar.
 ConfFileMustBeAFileNotADir=Die Konfigurationsdatei <b> %s </b> muss eine Datei und kein Verzeichnis sein.
-ConfFileReload=Alle Information aus der Konfigurationsdatei laden.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Ihre PHP-Konfiguration unterstützt Sessions.
 PHPSupportPOSTGETOk=Ihre PHP unterstützt GET und POST Variablen.
-PHPSupportPOSTGETKo=Ihre PHP-Konfiguration scheint GET- und/oder POST-Variablen nicht zu unterstützen. Überprüfen Sie in der php.ini den Parameter <b>variables_order</b>.
-PHPSupportGD=Ihre PHP-Konfiguration unterstützt grafische Funktionen mittels GD.
-PHPSupportCurl=PHP unterstützt die Erweiterung Curl
-PHPSupportUTF8=Ihre PHP-Konfiguration unterstützt UTF8-Funktionen.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=Dieses PHP unterstützt GD grafische Funktionen.
+PHPSupportCurl=Dieses PHP unterstützt Curl.
+PHPSupportUTF8=Dieses PHP unterstützt UTF8-Funktionen.
 PHPMemoryOK=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b>. Dies sollte ausreichend sein.
-PHPMemoryTooLow=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b> Bytes. Dies ist nicht ausreichend. Ändern Sie in Ihrer <b>php.ini</b> den Parameter <b>memory_limit</b> auf mindestens <b>%s</b> Bytes.
-Recheck=Voraussetzungen erneut prüfen
-ErrorPHPDoesNotSupportSessions=Ihre PHP-Installation unterstützt keine Sitzungen. Diese Funktion ist für das Arbeiten mit dolibarr erforderlich. Bitte überprüfen Sie Ihre PHP-Konfiguration.
-ErrorPHPDoesNotSupportGD=Ihre PHP-Installation unterstützt keine grafischen Funktion mittels GD. Ihnen stehen dadurch keine Diagramme zur Verfügung.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl nicht
-ErrorPHPDoesNotSupportUTF8=Ihre PHP-Installation unterstützt keine UTF8-Funktionen. Dies könnte die korrekte Funktionsweise von dolibarr behindern und Sie sollten dieses Problem vor der Installation beheben.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Das Verzeichnis %s existiert nicht.
-ErrorGoBackAndCorrectParameters=Gehen Sie zurück und korrigieren Sie die ungültigen Parameter.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Sie haben einen falschen Wert für den Parameter '%s' eingegeben.
 ErrorFailedToCreateDatabase=Fehler beim Erstellen der Datenbank '%s'.
 ErrorFailedToConnectToDatabase=Es konnte keine Verbindung zur Datenbank ' %s'.
 ErrorDatabaseVersionTooLow=Die Version ihrer Datenbank (%s) ist veraltet. Sie benötigen mindestens Version %s .
 ErrorPHPVersionTooLow=Ihre PHP-Version ist veraltet. Sie benötigen mindestens Version %s .
-ErrorConnectedButDatabaseNotFound=Die Verbindung zum Server wurde erfolgreich hergestellt, die Datenbank '%s' jedoch nicht gefunden.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Eine Datenbank mit dem Namen '%s' existiert bereits.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Sollte die Datenbank noch nicht existieren, gehen Sie bitte zurück und aktivieren Sie das Kontrollkästchen "Datenbank erstellen".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Sollte die Datenbank bereits existieren, gehen Sie bitte zurück und deaktivieren Sie das Kontrollkästchen "Datenbank erstellen".
-WarningBrowserTooOld=Sie verwenden eine zu alte Version des Browsers. Installieren Sie die aktuelle Version  Ihres Browser (Empfehlung: Firefox, Chrome oder Opera).
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP-Version
 License=Lizenzverwendung
 ConfigurationFile=Konfigurationsdatei
@@ -45,22 +45,23 @@ DolibarrDatabase=dolibarr-Datenbank
 DatabaseType=Datenbanktyp
 DriverType=Art des Treibers
 Server=Server
-ServerAddressDescription=Name oder IP-Adresse des Datenbankservers, in der Regel ist dies "localhost" (Datenbank und Webserver liegen auf demselben Server).
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Datenbankserver-Port. Lassen Sie dieses Feld im Zweifel leer.
 DatabaseServer=Datenbankserver
 DatabaseName=Name der Datenbank
-DatabasePrefix=Präfix für die Tabellen der Datenbank
-AdminLogin=Administrator Benutzername für Dolibarr Datenbank
-PasswordAgain=Passwort wiederholen
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Passwort des dolibarr-Datenbankadministrators
 CreateDatabase=Datenbank erstellen
-CreateUser=Erzeuge Besitzer oder erteile dem Benutzer Berechtigung für die Datenbank
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Datenbankserver - Superadministrator-Zugriff
-CheckToCreateDatabase=Aktivieren Sie dieses Kontrollkästchen, falls Sie noch keine Datenbank angelegt haben und diese im Zuge der Installation erstellt werden soll.<br>Hierfür müssen Sie Benutzername und Passwort des Datenbank-Superusers am Ende der Seite angeben.
-CheckToCreateUser=Aktivieren Sie dieses Kontrollkästchen, falls Sie noch keinen Datenbankbenutzer angelegt haben und dieser im Zuge der Installation erstellt werden soll.<br>Hierfür müssen Sie Benutzername und Passwort des Datenbank-Superusers am Ende der Seite angeben. Wenn dies nicht angekreuzt ist, müssen Datenbankeigentümer und Passwort schon existieren.
-DatabaseRootLoginDescription=Anmeldedaten des Datenbank-Superusers zur Erstellung neuer Datenbanken und -benutzer. Sollten diese bereits existieren (z.B. weil Ihre Website bei einem Hosting-Provider liegt), ist diese Option nutzlos.
-KeepEmptyIfNoPassword=Leer lassen wenn der Benutzer kein Passwort hat (nicht empfohlen)
-SaveConfigurationFile=Konfigurationsdatei wird gespeichert
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Serververbindung
 DatabaseCreation=Erstellung der Datenbank
 CreateDatabaseObjects=Anlegen der Datenbankobjekte
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Erstellen der Fremdschlüssel und Indizes für Tabelle %
 OtherKeysCreation=Erstellen der Fremdschlüssel und Indizes
 FunctionsCreation=Erstellen der Funktionen
 AdminAccountCreation=Erstellen des Administrationskontos
-PleaseTypePassword=Bitte geben Sie ein Passwort ein. Leere Passwörter sind unzulässig.
-PleaseTypeALogin=Bitte geben Sie einen Benutzernamen ein.
-PasswordsMismatch=Die eingegebenen Passwörter unterscheiden sich. Bitte versuchen Sie es erneut!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Ende der Erstkonfiguration
 SystemIsInstalled=Die Installation wurde erfolgreich abgeschlossen.
 SystemIsUpgraded=Der Aktualisierungsvorgang wurde erfolgreich abgeschlossen.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Nun sollten Sie dolibarr an Ihre Bedürfnisse anpassen
 AdminLoginCreatedSuccessfuly=Dolibarr Administrator login '<b>%s</b>' erfolgreich erstellt.
 GoToDolibarr=Zu dolibarr wechseln
 GoToSetupArea=Zu den dolibarr-Einstellungen
-MigrationNotFinished=Ihre Datenbankversion ist nicht auf dem neuesten Stand, bitte wiederholen Sie den Aktualisierungsvorgang.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Noch einmal zur Aktualisierungsseite
 WithNoSlashAtTheEnd=Ohne Schrägstrich "/" am Ende
-DirectoryRecommendation=Es empfiehlt sich die Verwendung eines Ordners außerhalb Ihres Webverzeichnisses.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Dieser Benutzername ist bereits vergeben
 DolibarrAdminLogin=Anmeldung für dolibarr-Administrator
-AdminLoginAlreadyExists=Ein Administratorkonto namens '<b>%s</b>' ist bereits vorhanden.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Fehler beim erstellen des Dolibarr Administrator Kontos.
-WarningRemoveInstallDir=Aus Sicherheitsgründen sollten Sie nach abgeschlossenem Installations-/Aktualisierungsvorgang das Installationsverzeichnis (<b>install</b>) löschen oder in "install.lock" umbenennen.
-FunctionNotAvailableInThisPHP=Diese Funktion steht in Ihrer PHP-Version nicht zur Verfügung.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Migrationsskript auswählen
 DataMigration=Datenbankmigration (Daten)
 DatabaseMigration=Datenbankmigration (Struktur + einige Daten)
 ProcessMigrateScript=Script-Verarbeitung
 ChooseYourSetupMode=Wählen Sie Ihre Installationsart und klicken Sie anschließend auf "Start"...
 FreshInstall=Neue Installation
-FreshInstallDesc=Verwenden Sie diesen Modus für Erstinstallationen. Sie können damit auch frühere, unvollständige Installationen reparieren. Für eine Aktualisierung Ihres Systems wählen Sie bitte den Installationstyp "Aktualisierung".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Aktualisierung
 UpgradeDesc=Verwenden Sie diesen Modus zum Ersetzen Ihrer bisherigen Dateien durch eine neuere Version. Dieser Vorgang beinhaltet eine Aktualisierung Ihrer Datenbank und -daten.
 Start=Start
 InstallNotAllowed=Die in der Konfigurationsdatei <b>conf.php</b> gesetzten Berechtigungen verhindern eine Ausführung des Installationsvorganges.
 YouMustCreateWithPermission=Für den Installationsvorgang erstellen Sie bitte die Datei %s und machen Sie diese für Ihren Webserver beschreibbar.
-CorrectProblemAndReloadPage=Bitte beheben Sie das Problem und klicken Sie anschließend auf F5 um die Seite neu zu laden.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Migration bereits durchgeführt
 DatabaseVersion=Datenbankversion
 ServerVersion=Version des Datenbankservers
 YouMustCreateItAndAllowServerToWrite=Bitte erstellen Sie dieses Verzeichnis und machen Sie dieses für Ihren Webserver beschreibbar.
 DBSortingCollation=Reihenfolge der Zeichensortierung
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Sie möchten die Datenbank <b>%s</b> erstellen. Hierfür benötigt dolibarr eine Verbindung zum Server <b>%s</b> mit den Berechtigungen des Super-Users %s.
-YouAskLoginCreationSoDolibarrNeedToConnect=Sie möchten den Datenbankbenutzer <b>%s</b> erstellen. Hierfür benötigt dolibarr eine Verbindung zum Server <b>%s</b> mit den Berechtigungen des Super-Users %s.
-BecauseConnectionFailedParametersMayBeWrong=Der Verbindungsaufbau ist fehlgeschlagen. Bitte überprüfen Sie die Einstellungen des Servers und Super-User-Zugangs.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Verwaiste Zahlung gefunden durch Methode %s
 RemoveItManuallyAndPressF5ToContinue=Bitte manuell entfernen und F5 drücken um fortzufahren.
 FieldRenamed=Feld umbenannt
-IfLoginDoesNotExistsCheckCreateUser=Sollte der Benutzer noch nicht existieren, müssen Sie das Kontrollkästchen "Benutzer erstellen" aktivieren
-ErrorConnection=Server <b>%s</b>', Datenbank '<b>%s</b>', Benutzer '<b>%s</b>' oder Datenbankpasswort scheinen falsch zu sein. Eventuell verhindert auch eine veraltete PHP- oder Datenbankversion den korrekten Verbindungsaufbau.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Es empfiehlt sich eine Aktualisierung auf Version <b>%s</b>. Ihre aktuelle Version ist <b>%s</b>.
 InstallChoiceSuggested=<b>Vom Installationsassistenten vorgeschlagene Wahl.</b>
-MigrateIsDoneStepByStep=Die gewählte Version (%s) hat ein Lücke von mehrerer Versionen. Der Installationsassistent wird sich wieder melden, um die nächste Migration vorzuschlagen. Dies geschieht bis zur endgültigen Fertigstellung.
-CheckThatDatabasenameIsCorrect=Bitte überprüfen Sie die Schreibweise des Datenbanknamens "<b>%s</b>".
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Sollte dieser Name korrekt und die Datenbank noch nicht vorhanden sein, aktivieren Sie bitte das Kontrollkästchen "Datenbank erstellen".
 OpenBaseDir=PHP openbasedir Einstellungen
-YouAskToCreateDatabaseSoRootRequired=Sie haben die Option "Datenbank erstellen" ausgewählt. Hierfür müssen Sie Benutzername und Passwort des Datenbank-Super-Users in das untenstehende Formular eintragen.
-YouAskToCreateDatabaseUserSoRootRequired=Sie haben die Option "Datenbankbenutzer erstellen" ausgewählt. Hierfür müssen Sie Benutzername und Passwort des Datenbank-Super-Users in das untenstehende Formular eintragen.
-NextStepMightLastALongTime=Der aktuelle Vorgang kann mehrere Minuten dauern. Holen Sie sich eine frische Tasse Kaffee, oder nutzen Sie die Gelegenheit für eine Rauchpause. Warten Sie jedoch bitte in jedem Fall, bis der nächste Bildschirm vollständig angezeigt wird, bevor Sie fortfahren.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Kundenauftragslieferung aktualisieren
 MigrationShippingDelivery=Aktualisiere die Speicherung von Lieferungen (Versandart?)
 MigrationShippingDelivery2=Aktualisiere die Speicherung von Lieferungen 2 (Versandart 2?)
 MigrationFinished=Migration abgeschlossen
-LastStepDesc=<strong>Letzter Schritt</strong>: Legen Sie Ihr Logo und das Passwort fest, welches Sie für dolibarr verwenden möchten. Verlieren Sie diese Administrator-Passwort nicht, da es der "Generalschlüssel" ist.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktivieren von Modul %s
 ShowEditTechnicalParameters=Hier klicken um erweiterte Funktionen zu zeigen/bearbeiten (Expertenmodus)
-WarningUpgrade=Warnung:\nHaben Sie ein Datenbank Backup erstellt ?\nDurch Bugs in Datenbank Systemen (zum Beispiel MySQL 5.5.40/42/42/43) könnten einige Daten oder Tabellen während des Prozesses verloren gehen.\nDeshlab ist es dringend empfohlen, einen kompletten Dump der Datenbank vor dem Start der Migration anzulegen !\n\nKlicke OK um die Migration zu starten...
-ErrorDatabaseVersionForbiddenForMigration=Die Version Ihres Datenbankmanager ist %s.\nDies ist einen kritischer Bug welcher zu Datenverlust führen kann, wenn Sie die Struktur der Datenbank wie vom Migrationsprozess erforderlich  ändern. Aus diesem Grund, ist die Migration nicht erlaubt bevor der Datenbankmanager auf eine später Version aktualisiert wurde (Liste betroffener Versionen %s )
-KeepDefaultValuesWamp=Wenn Sie den DoliWamp-Installationsassistent verwenden, werden hier bereits Werte vorgeschlagen. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
-KeepDefaultValuesDeb=Sie verwenden den Dolibarr-Installationsassistenten in einer Linux Umgebung (Ubuntu, Debian, Fedor...), entsprechend sind hier bereits Werte vorgeschlagenen. Sie müssen lediglich das Passwort des anzulegenden Datenbankbenutzers angeben. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
-KeepDefaultValuesMamp=Sie verwenden den DoliMamp-Installationsassistent, entsprechend werden hier bereits Werte vorgeschlagen. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
-KeepDefaultValuesProxmox=Sie verwenden den Dolibarr Installationsassistenten einer Proxmox "virtual appliance". Die hier vorgeschlagenen Werte sind bereits optimiert. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
-UpgradeExternalModule=Dedizierten Upgradeprozess für externe Module ausführen
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Zumindest eine Option für die URL Argumente ist notwendig. z.B. '...repair.php?standard=confirmed'
 NothingToDelete=Nichts zu säubern / zu löschen
 NothingToDo=Keine Aufgaben zum erledigen
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Vertragsdatenkorrektur
 MigrationContractsNumberToUpdate=%s Vertrag/Verträge zu aktualisieren
 MigrationContractsLineCreation=Erstelle Vertragszeile für Vertrag Nr. %s
 MigrationContractsNothingToUpdate=Keine weiteren Schritte.
-MigrationContractsFieldDontExist=Feld fk_facture existiert nicht mehr. Keine weiteren Schritte.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Korrektur nicht gesetzter Vertragsdaten
-MigrationContractsEmptyDatesUpdateSuccess=Leere Vertragsdatum eroflgreich korrigiert
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Kein nicht gesetztes Vertragsdatum zur Korrektur
 MigrationContractsEmptyCreationDatesNothingToUpdate=Kein Vertragserstellungsdatum zur Korrektur
 MigrationContractsInvalidDatesUpdate=Korrektur ungültiger Vertragsdaten
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Aktualisiere Lieferungen
 MigrationStockDetail=Aktualisiere den Lagerbestand von Produkten
 MigrationMenusDetail=Tabellen der dynamischen Menüs aktualisieren
 MigrationDeliveryAddress=Update Lieferadresse in Versand
-MigrationProjectTaskActors=Datenmigration für llx_projet_task_actors Tabelle
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Datenmigration des Feldes fk_user_resp von llx_projet nach llx_element_contact
 MigrationProjectTaskTime=Aktualisiere aufgewandte Zeit (in Sekunden)
 MigrationActioncommElement=Aktualisiere die Termine/Aufgaben
 MigrationPaymentMode=Migration der Daten für die Zahlungsart
 MigrationCategorieAssociation=Migration von Kategorien
-MigrationEvents=Ereignisse migrierern, um den Besitzer des Ereignisses der Zuordnungstabelle hinzuzufügen
-MigrationEventsContact=Migration der Ereignisse um die Kontaktinformationen in die Zuweisungstabelle hinzuzufügen
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise"
 MigrationRemiseExceptEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise_except"
 MigrationUserRightsEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_user_rights"
 MigrationUserGroupRightsEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_usergroup_rights"
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Neu Laden von Modul %s
 MigrationResetBlockedLog=Modul BlockedLog für v7 Algorithmus zurücksetzen
-ShowNotAvailableOptions=Nicht verfügbare Optionen anzeigen
-HideNotAvailableOptions=Nicht verfügbare Optionen ausblenden
-ErrorFoundDuringMigration=Während der Migration ist ein Fehler aufgetaucht, dadurch ist der nächste Schritt nicht verfügbar. Sie können <a href="%s">hier cklicken</a> um den Fehler zu ignorieren, aber die Anwendung oder manche Features werden unter Umständen nicht richtig funktionieren, solange der Fehler nicht behoben wurde.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Hier klicken um zu Ihrer Anwendung zu kommen
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 512a642623f..6f562fbcf90 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Ansprechpartner/Adressen dieses Partners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
 AddressesForCompany=Anschriften zu diesem Partner
 ActionsOnCompany=Ereignisse zu diesem Partner
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Aktionen zu diesem Mitglied
 ActionsOnProduct=Ereignisse zu diesem Produkt
 NActionsLate=%s verspätet
@@ -847,9 +848,9 @@ ModuleBuilder=Modul-Generator
 SetMultiCurrencyCode=Währung festlegen
 BulkActions=Massenaktionen
 ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen
-WebSite=Webseite
-WebSites=Internetseiten
-WebSiteAccounts=Website-Konten
+WebSite=Website
+WebSites=Webseiten
+WebSiteAccounts=Website accounts
 ExpenseReport=Spesenabrechnung
 ExpenseReports=Spesenabrechnungen
 HR=Personalabteilung
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Datei via Link geteilt
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im %s "Sandbox" -Modus
+Inventory=Inventur
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 4d32eec849b..a1cfc329ecd 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Verknüpftes Objekt
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nDas ist ein Test-Mail gesendet an __EMAIL__.\nDie beiden Zeilen sind durch einem Zeilenumbruch getrennt.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=Dies ist ein <b>Test</b> Mail (das Wort Test muss in Fettschrift erscheinen). <br> Die beiden Zeilen sollten durch einen Zeilenumbruch getrennt sein.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Einrichtung der Modul-Website
 WEBSITE_PAGEURL=URL der Seite
 WEBSITE_TITLE=TItel
 WEBSITE_DESCRIPTION=Beschreibung
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Schlüsselwörter
 LinesToImport=Positionen zum importieren
diff --git a/htdocs/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang
index 7b02bb6b49c..0a4fa7bd690 100644
--- a/htdocs/langs/de_DE/paybox.lang
+++ b/htdocs/langs/de_DE/paybox.lang
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL um Ihren Kunden eine %s Online-Bezahls
 ToOfferALinkForOnlinePaymentOnContractLine=URL um Ihren Kunden eine %s Online-Bezahlseite für Vertragspositionen anzubieten
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL um Ihren Kunden eine %s Online-Bezahlseite für frei wählbare Beträge anzubieten
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL um Ihren Mitgliedern eine %s Online-Bezahlseite für Mitgliedsbeiträge
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Sie können auch den URL-Parameter <b>&tag=<i>value</i></b> an eine beliebige dieser URLs anhängen (erforderlich nur bei der freien Zahlung) um einen eigenen Zahlungskommentar hinzuzufügen.
-SetupPayBoxToHavePaymentCreatedAutomatically=Richten Sie PayBox mit der URL <b>%s</b> ein, um nach Freigabe durch PayBox automatisch eine Zahlung anzulegen.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Hiermit Bestätigen wir, dass die Zahlung ausgeführt wurde. Vielen Dank.
-YourPaymentHasNotBeenRecorded=Ihre Zahlung wurde NICHT aufgezeichnet und die Transaktion wurde storniert. Vielen Dank.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Konto Parameter
 UsageParameter=Einsatzparameter
 InformationToFindParameters=Hilfe für das Finden der %s Kontoinformationen
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 8caf8ba14e7..7ec7aa277d9 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -20,20 +20,20 @@ LastModifiedProposals=Letzte %s bearbeitete Angebote
 AllPropals=Alle Angebote
 SearchAProposal=Angebot suchen
 NoProposal=Kein Entwurf
-ProposalsStatistics=Angebote Statistiken
+ProposalsStatistics=Angebote - Statistiken
 NumberOfProposalsByMonth=Anzahl pro Monat
 AmountOfProposalsByMonthHT=Betrag pro Monat (nach Steuern)
 NbOfProposals=Anzahl der Angebote
 ShowPropal=Zeige Angebot
 PropalsDraft=Entwürfe
-PropalsOpened=Geöffnet
+PropalsOpened=geöffnet
 PropalStatusDraft=Entwurf (freizugeben)
 PropalStatusValidated=Freigegeben (Angebot wieder geöffnet)
 PropalStatusSigned=Unterzeichnet (ist zu verrechnen)
 PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
-PropalStatusValidatedShort=Bestätigt
+PropalStatusValidatedShort=Bestätigt (offen)
 PropalStatusClosedShort=Geschlossen
 PropalStatusSignedShort=Unterzeichnet
 PropalStatusNotSignedShort=Nicht unterzeichnet
@@ -55,7 +55,7 @@ NoDraftProposals=Keine Angebotsentwürfe
 CopyPropalFrom=Erstelle neues Angebot durch Kopieren eines vorliegenden Angebots
 CreateEmptyPropal=Erstelle leeres Angebot oder aus der Liste der Produkte/Leistungen
 DefaultProposalDurationValidity=Standardmäßige Gültigkeitsdauer (Tage)
-UseCustomerContactAsPropalRecipientIfExist=Falls vorhanden die Adresse des Partnerkontakts statt der Partneradresse verwenden
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Angebot duplizieren
 ConfirmClonePropal=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> duplizieren möchten?
 ConfirmReOpenProp=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> wieder öffnen möchten ?
@@ -74,10 +74,11 @@ AvailabilityTypeAV_1M=1 Monat
 ##### Types de contacts #####
 TypeContact_propal_internal_SALESREPFOLL=Vertreter für Angebot
 TypeContact_propal_external_BILLING=Kontakt für Kundenrechnungen
-TypeContact_propal_external_CUSTOMER=Partnerkontakt für Angebot
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_CUSTOMER=Kundenkontakt für Angebot
+TypeContact_propal_external_SHIPPING=Kundenkontakt für Lieferung
 # Document models
 DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.)
+DocModelCyanDescription=Eine vollständige Angebotsvorlage (Logo, uwm.)
 DefaultModelPropalCreate=Erstellung Standardvorlage
 DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schließen wollen (zur Verrechung)
 DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung)
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 60f33ee68d1..52d4665d097 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Erstellen Sie hier für jede benötigte Website einen Eintrag. Gehen Sie anschließend in das Menü Websites zur Bearbeitung.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Website löschen
-ConfirmDeleteWebsite=Möchten Sie diese Website wirklich löschen? Alle Seiten inkl. Inhalt werden auch gelöscht.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Art der Seite/Containers
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGE_EXAMPLE=Seite die als Beispiel verwendet werden soll
 WEBSITE_PAGENAME=Seitenname/Alias
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALT=Alternative Seitennamen/Aliase
+WEBSITE_ALIASALTDesc=Liste mit einem anderen Namen/Alias verwenden, damit diese Seite auch von anderen Namen/Alias verwendet werden kann (z.B. die alte Seiten URL damit die alten Links noch funktionieren). Syntax: <br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL der externen CSS-Datei
 WEBSITE_CSS_INLINE=CSS-Dateiinhalt (für alle Seiten gleich)
 WEBSITE_JS_INLINE=Javascript-Dateiinhalt (für alle Seiten gleich)
-WEBSITE_HTML_HEADER=Diesen Code am Schluss des HTML Headers anhängen (Für alle Seiten gleich)
+WEBSITE_HTML_HEADER=Diesen Code am Schluss des HTML Headers anhängen (für alle Seiten gleich)
 WEBSITE_ROBOT=Roboterdatei (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess-Datei
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML Header (Nur für diese Seite)
 PageNameAliasHelp=Name oder Alias der Seite. <br>Dieser Alias wird auch zum erstellen einer SEO URL verwendet, wenn die Webseite auf einem Virtuellen Webserver läuft. Verwenden Sie der Button "<strong>%s</strong>" um den Alias zu ändern.
 EditTheWebSiteForACommonHeader=Hinweis: Um einen personalisierten Header für alles Seiten zu erstellen, muss der Header auf Site-Level bearbeitet werden, anstelle auf Seiten/Containerebene.
 MediaFiles=Medienbibliothek
-EditCss=Bearbeiten Sie Style / CSS oder HTML-Header
+EditCss=Edit website properties
 EditMenu=Menü bearbeiten
 EditMedias=Medien bearbeiten
-EditPageMeta=Meta bearbeiten
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Website hinzufügen
 Webpage=Webseite / Container
 AddPage=Seite/Container hinzufügen
 HomePage=Startseite
 PageContainer=Seite / Container
-PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht Verfügbar. Zuerst muss eine Seite hinzugefügt werden.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen.
+SiteDeleted=Web site '%s' deleted
 PageContent=Seite / Container 
 PageDeleted=Seite / Container '%s' der Website %s gelöscht
 PageAdded=Seite / Container '%s' hinzugefügt
@@ -36,49 +39,57 @@ ViewPageInNewTab=Seite in neuem Tab anzeigen
 SetAsHomePage=Als Startseite festlegen
 RealURL=Echte URL
 ViewWebsiteInProduction=Anzeige der Webseite über die Startseite\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nüber die URL der Homepage
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Kontrolliere dass auch der Virtuelle Host die <strong>%s</strong> Berechtigung für die die Dateien in <br><strong>%s</strong> hat
 ReadPerm=Lesen
-WritePerm=Write
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL des virtuellen Hosts, der von einem externen Webserver bedient wird, ist nicht definiert
+WritePerm=Schreiben
+PreviewSiteServedByWebServer=Die <u>Vorschau %s in einem neuen Tab</u><br><br>%s wird durch einen externen Webserver (Wie Apache, Nginx, IIS) ausgeliefert. Dieser Server muss installiert und eingerichtet sein, bevor Sie den Verzeichnis <br><strong>%s</strong> anzeigen können.<br> URL, die von dem externen Server bereitgestellt wird: <br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Vorschau %sin neuem Tab. <br><br>%s wird durch den Dolibarr Server so bereit gestellt, dass kein zusätzlicher Webserver (Wie Apache, Nginx, IIS) notwendig ist. <br>Dadurch erhalten die Seiten URL's, die nicht Benutzerfreundlich sind und der Pfad beginnt mit ihrer Dolibarr Installation.<br> Durch Dolibarr bereit gestellte URL: <br><strong>%s</strong><br><br>Um Ihren eigenen externen Webserver für diese Website zu verwenden, erstellen Sie einen virtuellen Host auf Ihrem Webserver, der auf das Verzeichnis <br><strong>%s</strong>zeigt<br>. Vorschau durch Klick auf den anderen Vorschaubutton.
+VirtualHostUrlNotDefined=Die URL des virtuellen Hosts, der von einem externen Webserver bereit gestellt wird, ist nicht definiert
 NoPageYet=Noch keine Seiten
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Hilfe zu bestimmten Syntaxtipps
 YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Seite klonen
 CloneSite=Seite klonen
-SiteAdded=Website hinzugefügt
+SiteAdded=Website added
 ConfirmClonePage=Bitte geben Sie den Code / Alias ​​einer neuen Seite ein und ob es sich um eine Übersetzung der geklonten Seite handelt.
 PageIsANewTranslation=Die neue Seite ist eine Übersetzung der aktuellen Seite?
 LanguageMustNotBeSameThanClonedPage=Sie klonen eine Seite als Übersetzung. Die Sprache der neuen Seite muss sich von der Sprache der Quellseite unterscheiden.
 ParentPageId=ID der übergeordneten Seite
 WebsiteId=Website-ID
 CreateByFetchingExternalPage=Erstellen Sie eine Seite / einen Container, indem Sie die Seite von einer externen URL abrufen ...
-OrEnterPageInfoManually=Oder leere Seite von Grund auf erstellen ...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Abrufen und erstellen
-ExportSite=Website exportieren
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=ID der Seite
 Banner=Banner
 BlogPost=Blog Eintrag
-WebsiteAccount=Website-Konto
-WebsiteAccounts=Website-Konten
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Erstellen Sie ein Website-Konto
 BackToListOfThirdParty=Zurück zur Liste für Drittanbieter
 DisableSiteFirst=Webseite zuerst deaktivieren
 MyContainerTitle=Titel der Webseite
 AnotherContainer=Ein weiterer Container
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
+WEBSITE_USE_WEBSITE_ACCOUNTS=Benutzertabelle für Webseite aktivieren
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiviere die Benutzertabelle um Webseitenlogins (Login/Kennwort) für alle Webseiten / Partner
+YouMustDefineTheHomePage=Zuerst muss die Startseite definiert sein
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+OnlyEditionOfSourceForGrabbedContent=Der HTML Code kann nur editiert werden, wenn der Inhalt von einer externen Site geladen wurde
+GrabImagesInto=Auch Bilder aus CSS und Seite übernehmen
+ImagesShouldBeSavedInto=Bilder sollten im Verzeichnis gespeichert werden
+WebsiteRootOfImages=Hauptververzeichnis für Websitebilder
+SubdirOfPage=Unterverzeichnis für die Seite
+AliasPageAlreadyExists=Alisseite <strong>%s</strong> existiert schon
+CorporateHomePage=Firmenwebseite
+EmptyPage=Leere Seite
+ExternalURLMustStartWithHttp=Externe URL muss mit http:// oder https:// beginnen
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 0069c20110c..fd1a95962b1 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Εργαλεία πολλαπλών modules
 ModuleFamilyExperimental=Πειραματικά modules
 ModuleFamilyFinancial=Χρηματοοικονομικά Modules (Λογιστική/Χρηματοοικονομικά)
 ModuleFamilyECM=Διαχείριση Ηλεκτρονικού Περιεχομένου (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Διαχειριστές μενού
 MenuAdmin=Επεξεργαστής μενού
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Χρήστες και Ομάδες
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Διαχείριση εταιρειών και επαφών (πελάτες, πιθανοί πελάτες...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Εμπορικό
 Module2Desc=Εμπορική διαχείριση
 Module10Name=Λογιστική
@@ -501,7 +501,7 @@ Module23Desc=Παρακολούθηση κατανάλωσης ενέργεια
 Module25Name=Παραγγελίες πελάτη
 Module25Desc=Διαχείριση παραγγελιών πελατών
 Module30Name=Τιμολόγια
-Module30Desc=Τιμολόγιο και πιστωτικό τιμολόγιο διαχείρισης για τους πελάτες. Τιμολόγιο διαχείρισης για τους προμηθευτές
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Προμηθευτές
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Τιμές ΦΠΑ ή φόρου επί των πωλήσεων
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Όροι πληρωμής
 DictionaryPaymentModes=Τρόποι πληρωμής
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Οικολογικός φόρος (ΑΗΗΕ)
 DictionaryPaperFormat=Μορφές χαρτιού
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Ετικέτα στα έγγραφα
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Στο τέλος του μήνα
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Ιστορικό εισόδου χρηστών
+Audit=Security events
 InfoDolibarr=Πληροφορίες Dolibarr
 InfoBrowser=Πληροφορίες Φυλλομετρητή
 InfoOS=Πληροφορίες ΛΣ
@@ -1065,7 +1066,7 @@ BrowserName=Όνομα φυλλομετρητή
 BrowserOS=Λειτουργικό σύστημα φυλλομετρητή
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Συμβάντα ασφαλείας εξαγνίζονται
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Καθαρή τιμή επί του προϊόντος
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Συμπληρωματικές ιδιότητες (τιμολόγια)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Λίστα ειδοποιήσεων ανά χρήστ
 ListOfNotificationsPerUserOrContact=Λίστα ειδοποιήσεων ανά χρήστη* ή ανά επαφή**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 84d9972c966..462842b62b3 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -7,7 +7,7 @@ BankName=Όνομα Τράπεζας
 FinancialAccount=Λογαριασμός
 BankAccount=Τραπεζικός Λογαριασμός
 BankAccounts=Τραπεζικοί Λογαριασμοί
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Εμφάνιση λογαριασμού
 AccountRef=Αναγνωριστικό Λογιστικού Λογαριασμού
 AccountLabel=Ετικέτα Λογιστικού Λογαριασμού
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Πάγια Εντολή
 BankAccountCountry=Χώρα λογαριασμού
 BankAccountOwner=Ιδιοκτήτης Λογαριασμού
 BankAccountOwnerAddress=Διεύθυνση Ιδιοκτήτη
-RIBControlError=Ο έλεγχος ακεραιότητας των τιμών απέτυχε. Αυτό σημαίνει ότι οι πληροφορίες του λογαριασμού δεν είναι επαρκείς ή είναι λανθασμένες (ελέγξτε χώρα, αριθμό και IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Δημιουργία Λογαριασμού
 NewBankAccount=Νέος Λογαριασμός
 NewFinancialAccount=Νέος Λογιστικός Λογαριασμός
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Μπορεί να πραγματοποιηθεί
 Conciliate=Πραγματοποίηση Συναλλαγής
 Conciliation=Πραγματοποίηση Συναλλαγής
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Συμπερίληψη Κλειστών Λογαριασμών
 OnlyOpenedAccount=Μόνο ανοικτούς λογαριασμούς
@@ -104,7 +105,7 @@ SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε α
 BankTransfer=Τραπεζική Μεταφορά
 BankTransfers=Τραπεζικές Μεταφορές
 MenuBankInternalTransfer=Εσωτερική μεταφορά
-TransferDesc=Μεταφορά από ένα λογαριασμό σε κάποιον άλλο, το Dolibarr θα δημιουργήσει δύο εγγραφές (μία χρέωση στον λογαριασμό προέλευσης και μία πίστωση στον λογαριασμό στόχο. Το ίδιο ποσό (εκτός του προσήμου), αναφορά και ημερομηνία θα χρησιμοποιηθούν για αυτή την συναλλαγή)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Από
 TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να 
 BankChecks=Τραπεζικές Επιταγές
 BankChecksToReceipt=Επιταγές που αναμένουν κατάθεση
 ShowCheckReceipt=Ελέγξτε την απόδειξη κατάθεσης
-NumberOfCheques=Πλήθος Επιταγών
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
-FutureTransaction=Συναλλαγή στο μέλλον. Δεν υπάρχει τρόπος συμβιβασμού.
-SelectChequeTransactionAndGenerate=Επιλέξτε/φίλτρο ελέγχου για να συμπεριληφθεί στην απόδειξη κατάθεσης και κάντε κλικ στο "Δημιουργία".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Ημερομηνία ελέγχου επιστροφής
 CheckRejected=Ελέγξτε την επιστροφή
 CheckRejectedAndInvoicesReopened=Ελέγξτε την επιστροφή και ξανά ανοίξτε τα τιμολόγια
 BankAccountModelModule=Πρότυπα εγγράφων για τραπεζικούς λογαριασμούς
-DocumentModelSepaMandate=Πρότυπο SEPA. Χρήσιμο μόνο για κράτη μέλη της Ευρωζώνης.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Πρότυπο για εκτύπωση σελίδας με πληροφορίες BAN.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index a927f6294c6..9bed2cae9ba 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Προτιμολόγιο
 InvoiceProFormaDesc=Το <b>Προτιμολόγιο</b> είναι η εικόνα ενός πραγματικού τιμολογίου, χωρίς όμως να έχει χρηματική αξία
 InvoiceReplacement=Τιμολόγιο Αντικατάστασης
 InvoiceReplacementAsk=Αντικατάσταση τιμολογίου με
-InvoiceReplacementDesc=<b>Τιμολόγιο αντικατάστασης</b> χρησιμοποιείται για να ακυρώσει και να αντικαταστήσει πλήρως ένα απλήρωτο τιμολόγιο.<br><br>Σημείωση: Μόνο τα τιμολόγια χωρίς καμία πληρωμή μπορούν να αντικατασταθούν. Εάν το τιμολόγιο που θα αντικατασταθεί δεν έχει κλείσει, θα κλείσει αυτόματα και θα σημειωθεί «εγκαταλειμμένο».
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Πιστωτικό τιμολόγιο
 InvoiceAvoirAsk=Πιστωτικό τιμολόγιο για την διόρθωση τιμολογίου
-InvoiceAvoirDesc=Το <b>πιστωτικό τιμολόγιο</b>είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Δημιουργία Πιστωτικού τιμολογίου με γραμμές από το τιμολόγιο προέλευσης.
 invoiceAvoirWithPaymentRestAmount=Δημιουργήστε Πιστωτικό Τιμολόγιο με το υπόλοιπο πριν από την καταβολή του τιμολογίου
 invoiceAvoirLineWithPaymentRestAmount=Πιστωτικό τιμολόγιο για το υπολειπόμενο ανεξόφλητο ποσό
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Διαγραφή Πληρωμής
 ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε την πληρωμή;
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Πληρωμές Προμηθευτών
 ReceivedPayments=Ληφθείσες Πληρωμές
 ReceivedCustomersPayments=Ληφθείσες Πληρωμές από πελάτες
-PayedSuppliersPayments=Οι πληρωμές που καταβάλλονται σε προμηθευτές
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Ληφθείσες Πληρωμές από πελάτες προς έγκριση
 PaymentsReportsForYear=Αναφορές Πληρωμών για %s
 PaymentsReports=Αναφορές Πληρωμών
@@ -91,8 +91,8 @@ PaymentConditionsShort=Όροι πληρωμής
 PaymentAmount=Σύνολο πληρωμής
 ValidatePayment=Επικύρωση πληρωμής
 PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
 ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο'
 ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Κλειστό (απλήρωτο)
 BillStatusClosedPaidPartially=Πληρωμένο (μερικώς)
 BillShortStatusDraft=Πρόχειρο
 BillShortStatusPaid=Πληρωμένο
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Επεξεργάστηκε
 BillShortStatusCanceled=Εγκαταλελειμμένο
 BillShortStatusValidated=Επικυρωμένο
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Κλειστό
 BillShortStatusClosedPaidPartially=Πληρωμένο (μερικώς)
 PaymentStatusToValidShort=Προς επικύρωση
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Το τιμολόγιο %s δεν υπάρχει
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Από
 BillTo=Στοιχεία Πελάτη
 ActionsOnBill=Ενέργειες στο τιμολόγιο
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχει τακτοποιηθεί το ΦΠΑ με πιστωτικό τιμολόγιο.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
 ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Επιλέξτε αυτή την επιλογή αν οι υπόλοιπες δεν ταιριάζουν
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Ένας <b>κακός πελάτης</b>είναι ένας πελάτης που αρνείται να ξεπληρώσει το χρέος του.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Άλλος
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Επικύρωση τιμολογίου
 UnvalidateBill=Μη επαληθευμένο τιμολόγιο
-NumberOfBills=Πλήθος τιμολογίων
-NumberOfBillsByMonth=Πλήθος τιμολογίων ανά μήνα
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Ποσό τιμολογίων
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
 ShowSocialContribution=Εμφάνιση κοινωνικών εισφορών / Φορολογικά
 ShowBill=Εμφάνιση τιμολογίου
@@ -260,9 +262,9 @@ Repeatables=Πρώτυπα
 ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
 CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο
 CreateFromRepeatableInvoice=Δημιουργία από πρότυπο τιμολόγιο
-CustomersInvoicesAndInvoiceLines=Τιμολόγια πελάτη και γραμμές τιμολογίου
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
-ExportDataset_invoice_1=Λίστα Τιμολλογίων πελάτη και γραμμών τιμολογίου
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Πληρωμές και τιμολόγια πελατών
 ProformaBill=Proforma Bill:
 Reduction=Μείωση
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Διεύθυνση χρέωσης
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Κοινωνική εισφορά / Φορολογικά id πληρωμής
 PaymentId=Κωδ. Πληρωμής
 PaymentRef=Αναφ. πληρωμής
@@ -321,22 +323,22 @@ InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
 CloneInvoice=Κλωνοποίηση τιμολογίου
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Αριθμός πληρωμών
+DescTaxAndDividendsArea=Αυτή η περιοχή παρουσιάζει μια σύνοψη όλων των πληρωμών που γίνονται για ειδικά έξοδα. Μόνο εγγραφές με πληρωμή κατά τη διάρκεια του ημερολογιακού έτους περιλαμβάνονται εδώ.
+NbOfPayments=No. of payments
 SplitDiscount=Χωρισμός έκπτωσης σε δύο μέρη
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Εισαγωγή συνόλου για καθένα από τα δύο μέρη:
-TotalOfTwoDiscountMustEqualsOriginal=Το σύνολο των δύο νέων τμημάτων πρέπει να είναι ίσο με την αρχική έκπτωση
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Σχετιζόμενο τιμολόγιο
 RelatedBills=Σχετιζόμενα τιμολόγια
 RelatedCustomerInvoices=Σχετικά τιμολόγια πελατών
 RelatedSupplierInvoices=Σχετικά τιμολόγια προμηθευτών
 LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο
-WarningBillExist=Προσοχή, ένα ή περισσότερα τιμολόγια υπάρχουν ήδη
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Συγχώνευση εργαλείο PDF
 AmountPaymentDistributedOnInvoice=Ποσό πληρωμής κατανεμημένο στο τιμολόγιο
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Σημείωση πληρωμής
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Επιταγή
 PaymentTypeShortCHQ=Επιταγή
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line πληρωμή
-PaymentTypeShortVAD=On line πληρωμή
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Πρόχειρο
 PaymentTypeFAC=Παράγοντας
 PaymentTypeShortFAC=Παράγοντας
 BankDetails=Πληροφορίες τράπεζας
 BankCode=Κωδικός τράπεζας
-DeskCode=Κωδικός γραφείου
+DeskCode=Office code
 BankAccountNumber=Αριθμός Λογαριασμού
-BankAccountNumberKey=Κωδ.
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=Αριθμός IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Πληρωμή με έμβασμα στον 
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=τα εμπορεύματα παραμένουν στην κυριότητα του
-LawApplicationPart3=του πωλητή μέχρι την πλήρη εξαργύρωση
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=η τιμή τους.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Εφαρμογή
@@ -463,7 +465,7 @@ Cheques=Επιταγές
 DepositId=Id Κατάθεση
 NbCheque=Αριθμός επιταγών
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Χρησιμοποιήστε πελάτη διεύθυνση επικοινωνίας χρέωσης αντί των Πελ./Προμ. διεύθυνση για τα τιμολόγια
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
 ShowUnpaidLateOnly=Εμφάνιση μόνο των καθυστερημένων απλήρωτων τιμολογίων
 PaymentInvoiceRef=Πληρωμή τιμολογίου %s
@@ -474,21 +476,22 @@ Reported=Με καθυστέρηση
 DisabledBecausePayments=Δεν είναι δυνατόν, δεδομένου ότι υπάρχουν ορισμένες πληρωμές
 CantRemovePaymentWithOneInvoicePaid=Δεν μπορείτε να καταργήσετε τη πληρωμή, δεδομένου ότι υπάρχει τουλάχιστον ένα τιμολόγιο που έχει χαρακτηριστεί σαν πληρωμένο
 ExpectedToPay=Αναμενόμενη Πληρωμή
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Πληρωθείτε αυτό το ποσό
-ClosePaidInvoicesAutomatically=Κατατάσσουν "Καταβάλλονται" όλα τα στάνταρ, κατάσταση ή την αντικατάσταση των τιμολογίων βαρύνει εξ ολοκλήρου.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Ταξινομήσει τα "Πληρωμένα" όλα τα πιστωτικά τιμολόγια που καταβάλλονται εξ ολοκλήρου πίσω.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια χωρίς υπόλοιπο για πληρωμή θα κλείσουν αυτόματα σε κατάσταση "Πληρωμένα".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Πληρωμή
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Κατάλογος των απλήρωτων τιμολογίων
 NoteListOfYourUnpaidInvoices=Σημείωση: Αυτή η λίστα περιέχει μόνο τα τιμολόγια για λογαριασμό Πελ./Προμ. που συνδέονται με τον εκπρόσωπο πώλησης.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Τιμολόγιο πρότυπο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (συνιστώμενο πρότυπο)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Επιστρέψετε αριθμό με μορφή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος, mm είναι ο μήνας και nnnn είναι μια ακολουθία αρίθμησης χωρίς διάλειμμα και χωρίς επιστροφή στο 0
 MarsNumRefModelDesc1=Επιστρέφει αριθμό με μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τα τιμολόγια αντικατάστασης, %syymm-nnnn για τα τιμολόγια των καταθέσεων και %syymm-nnnn για πιστωτικά σημειώματα όπου yy είναι το έτος, mm είναι μήνας και nnnn είναι μια ακολουθία χωρίς διακοπή και χωρίς επιστροφή σε 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Σφάλμα : ενημέρωση τιμής στη γραμμή τιμολογίου : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Το τιμολόγιο διαγράφηκε
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 9292e676d05..500e6e5bb8f 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Εμφάνιση εταιρείας
 ShowStock=Εμφάνιση αποθήκης
 DeleteArticle=Κάντε κλικ για να καταργήσετε αυτό το προϊόν
 FilterRefOrLabelOrBC=Αναζήτηση (Κωδ. / Ετικέτα)
-UserNeedPermissionToEditStockToUsePos=Θα ζητήσει να μειώσει το απόθεμα κατά την δημιουργία του τιμολογίου, έτσι ώστε ο χρήστης που χρησιμοποιεί το POS να χρειάζεται να έχει άδεια για να επεξεργαστείτε το απόθεμα.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr εκτυπωτής αποδείξεων
+PointOfSale=Σημείο πωλήσεων
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index fcd6f86ea4e..76ce0ba49a9 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Τηλεφώνημα
 ActionAC_FAX=Αποστολή FAX
 ActionAC_PROP=Αποστολή προσφορας με email
 ActionAC_EMAIL=Αποστολή email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Συναντήσεις
 ActionAC_INT=Παρέμβαση on site
 ActionAC_FAC=Αποστολή Τιμολογίου στον πελάτη με email
@@ -72,8 +73,8 @@ StatusProsp=Κατάσταση προοπτικής
 DraftPropals=Σχέδιο εμπορικών προσφορών
 NoLimit=Κανένα όριο
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang
index 1b10a64cfd6..ed08791d549 100644
--- a/htdocs/langs/el_GR/dict.lang
+++ b/htdocs/langs/el_GR/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Χονγκ Κονγκ
-CountryIS=Ισλανδία
+CountryIS=Iceland
 CountryIN=Ινδία
 CountryID=Ινδονησία
 CountryIR=Ιράν
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Βόρεια Κορέα
 CountryKR=Νότια Κορέα
 CountryKW=Κουβέιτ
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Λάτβια
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Τόνγκα
 CountryTT=Trinidad and Tobago
 CountryTR=Τουρκία
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Ουγκάντα
 CountryUA=Ουκρανία
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index ca19c547e78..17590e0b196 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Έγγραφα που συνδέονται με σχέδια
 ECMDocsByUsers=Έγγραφα που συνδέονται με χρήστες
 ECMDocsByInterventions=Έγγραφα που συνδέονται με τις παρεμβάσεις
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Δεν δημιουργήθηκε φάκελος
 ShowECMSection=Εμφάνιση φακέλου
 DeleteSection=Διαγραφή φακέλου
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 13aa9957a77..ef526c8a27a 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Το πεδίο  <b>%s</b> πρέπει να περιέχει αριθμητική τιμή
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/el_GR/help.lang b/htdocs/langs/el_GR/help.lang
index 3cc437c8d5d..b0b3bc78c54 100644
--- a/htdocs/langs/el_GR/help.lang
+++ b/htdocs/langs/el_GR/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Συνδεδεμένοι πραγματικό χρόνο /
 OtherSupport=Άλλες υποστήριξη
 ToSeeListOfAvailableRessources=Για να επικοινωνήσετε / δείτε τους διαθέσιμους πόρους:
 HelpCenter=Κέντρο Βοήθειας
-DolibarrHelpCenter=Dolibarr Κέντρο Βοήθειας και Υποστήριξης
-ToGoBackToDolibarr=Διαφορετικά, κάντε κλικ <a href="%s">εδώ για να χρησιμοποιήσετε Dolibarr</a>
-TypeOfSupport=Πηγή της υποστήριξης
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Κοινότητα (δωρεάν)
 TypeSupportCommercial=Εμπορική
 TypeOfHelp=Τύπος
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Αποδοτικότητα
 TypeHelpOnly=Βοήθεια μόνο
 TypeHelpDev=Βοήθεια + Ανάπτυξη
-TypeHelpDevForm=Βοήθεια + + Σύσταση Ανάπτυξης
-ToGetHelpGoOnSparkAngels1=Ορισμένες εταιρείες μπορεί να παρέχουν μια γρήγορη (άμεση κάποτε) και πιο αποτελεσματική online υποστήριξη, αναλαμβάνοντας τον έλεγχο του υπολογιστή σας. Οι βοηθοί μπορούν να βρεθούν στην ιστοσελίδα <b>%s:</b>
-ToGetHelpGoOnSparkAngels3=Μπορείτε επίσης να πάτε στη λίστα όλων των διαθέσιμων προπονητών για Dolibarr, γι 'αυτό κάντε κλικ στο κουμπί
-ToGetHelpGoOnSparkAngels2=Μερικές φορές, δεν υπάρχει καμία εταιρεία που ήταν διαθέσιμα τη στιγμή που κάνετε την αναζήτησή σας, οπότε σκεφτείτε να αλλάξετε το φίλτρο για να ψάξουν για &quot;όλα τα διαθεσιμότητα&quot;. Θα είναι σε θέση να στείλει περισσότερα αιτήματα.
-BackToHelpCenter=Διαφορετικά, κάντε κλικ εδώ για να πάτε <a href="%s">πίσω για να βοηθήσει το κέντρο αρχική σελίδα</a> .
-LinkToGoldMember=Μπορείτε να καλέσετε ένα από τα πούλμαν που έχουν επιλέξει Dolibarr για τη γλώσσα σας (%s) κάνοντας κλικ Widget του (κατάσταση και μέγιστη τιμή ενημερώνονται αυτόματα):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Υποστηριζόμενες γλώσσες
-SubscribeToFoundation=Για βοήθεια του έργου Dolibarr, εγγραφείτε στο ίδρυμα
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Για την επίσημη υποστήριξη Dolibarr στη γλώσσα σας: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 24fff5af365..e43fb094c36 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Άδειες
-CPTitreMenu=Άδειες
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Μηνιαία αναφορά
 MenuAddCP=Αίτηση νέας αποχώρησης
-NotActiveModCP=Θα πρέπει να ενεργοποιήσετε τις Άδειες module για να δείτε αυτή τη σελίδα.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Κάντε αίτηση άδειας
 DateDebCP=Ημερ. έναρξης
 DateFinCP=Ημερ. τέλους
@@ -15,13 +15,18 @@ ApprovedCP=Εγκεκριμένο
 CancelCP=Ακυρώθηκε
 RefuseCP=Απόρριψη
 ValidatorCP=Έγκριση
-ListeCP=Λίστα των αδειών
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Θα πρέπει να επανεξεταστεί από
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Περιγραφή
 SendRequestCP=Δημιουργήστε το αίτημα άδειας
 DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον <b>%s ημέρα(ες)</b> πριν από τις.
-MenuConfCP=Ισορροπία αδειών
-SoldeCPUser=Η ισορροπία των αδειών είναι <b>%s</b> ημέρες.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης.
 ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας:
 ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, η αίτηση άδειας δεν υπάρχει.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Δεν έχετε άδεια για να διαβάσετε αυ
 InfosWorkflowCP=Πληροφορίες για την ροή εργασιών
 RequestByCP=Ζητήθηκε από
 TitreRequestCP=Αφήστε το αίτημα
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Αριθμός των ημερών για τις άδειες που καταναλώνεται
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Επεξεργασία
 DeleteCP=Διαγραφή
 ActionRefuseCP=Απορρίφθηκε
@@ -59,6 +71,7 @@ DateRefusCP=Ημερομηνία της άρνησης
 DateCancelCP=Ημερομηνία της ακύρωσης
 DefineEventUserCP=Αναθέστε μια έκτακτη άδεια για έναν χρήστη
 addEventToUserCP=Αφήστε την ανάθεση
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Λόγος
 UserCP=Χρήστης
 ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Ενημερώθηκε με επιτυχία.
 Module27130Name= Διαχείριση των αιτήσεων αδειών
 Module27130Desc= Διαχείριση των αιτήσεων αδειών
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Επικύρωση των αιτήσεων για τις άδειες
 HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας για την επικύρωση
 HolidaysToValidateDelay=Αυτή η αίτηση αδείας θα πραγματοποιηθεί εντός προθεσμίας μικρότερης των %s ημερών.
-HolidaysToValidateAlertSolde=Ο χρήστης που έκανε αυτό το αίτημα δεν έχει αρκετές διαθέσιμες ημέρες.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Επικυρώθηκαν οι αιτήσεις άδειας
 HolidaysValidatedBody=Η αίτηση αδείας %s στο %s έχει επικυρωθεί.
 HolidaysRefused=Αίτηση αρνήθηκε
@@ -103,4 +121,9 @@ HolidaysCanceled=Ακυρώθηκε το αίτημα αδείας
 HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index abac0b9205b..8810046bc38 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Απλά ακολουθήστε τις οδηγίες βήμα προς βήμα.
 MiscellaneousChecks=Ελέγχος Προαπαιτούμενων
 ConfFileExists=Το αρχείο ρυθμίσεων <b>%s</b> υπάρχει.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Το αρχείο ρυθμίσεων <b>%s</b> δεν υπάρχει και δεν μπορεί να δημιουργηθεί!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Το αρχείο ρυθμίσεων <b>%s</b>θα μπορούσε να δημιουργηθεί.
-ConfFileIsNotWritable=Το αρχείο ρυθμίσεων <b>%s</b> δεν είναι εγγράψιμο. Ελέγξτε τις άδειες. Για πρώτη εγκατάσταση, ο web server σας θα πρέπει να έχει άδεια για να μπορεί να εγγράφει σε αυτό το αρχείο κατά την διάρκεια της διαδικασίας ρύθμισης. (Π.χ. "chmod 666" σε ένα ΛΣ τύπου Unix).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Το αρχείο ρυθμίσεων <b>%s</b> είναι εγγράψιμο.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Φορτώσετε εκ νέου όλες τις πληροφορίες από το αρχείο ρυθμίσεων.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
 PHPSupportPOSTGETOk=Η PHP υποστηρίζει μεταβλητές POST και GET.
-PHPSupportPOSTGETKo=Είναι πιθανόν ότι οι ρυθμίσεις σας PHP δεν υποστηρίζουν τις μεταβλητές POST και/ή GET. Ελέγξτε την παράμετρο <b>variables_order</b> στο php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=Η php υποστηρίζει Curl
-PHPSupportUTF8=Αυτή η PHP υποστηρίζει UTF8 λειτουργίες.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Η εγκατάσταση της php δεν υποστηρίζει Curl
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Κατάλογος %s δεν υπάρχει.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Απέτυχε η δημιουργία της βάσης δεδομένων '%s'.
 ErrorFailedToConnectToDatabase=Απέτυχε η σύνδεση με τη βάση δεδομένων '%s'.
 ErrorDatabaseVersionTooLow=Η έκδοση της βάσης δεδομένων (%s), είναι πολύ παλιά. %s Έκδοση ή μεγαλύτερη απαιτείται.
 ErrorPHPVersionTooLow=Έκδοση της PHP είναι πολύ παλιά.  Έκδοση %s απαιτείται
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Η βάση δεδομένων '%s' υπάρχει ήδη.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Πάρα πολύ παλιά έκδοση του προγράμματος περιήγησης. Αναβάθμιση του προγράμματος περιήγησης σας σε μια πρόσφατη έκδοση του Firefox, Chrome ή Opera συστήνεται.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Έκδοση PHP
 License=Χρήση άδειας
 ConfigurationFile=Αρχείο ρυθμίσεων
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr βάση δεδομένων
 DatabaseType=Τύπος βάσης δεδομένων
 DriverType=Τύπος Driver
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Θύρα του διακομιστή βάσης δεδομένων. Αφήστε το πεδίο κενό αν δεν το γνωρίζετε.
 DatabaseServer=Server της βάσης δεδομένων
 DatabaseName=Όνομα της βάσης δεδομένων
-DatabasePrefix=Πρόθεμα πίνακα της βάσης δεδομένων
-AdminLogin=Είσοδος ιδιοκτήτη της βάσης δεδομένων Dolibarr.
-PasswordAgain=Ξαναγράψτε τον κωδικό
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Κωδικός ιδιοκτήτη της βάσης δεδομένων Dolibarr.
 CreateDatabase=Δημιουργία βάσης δεδομένων
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, useless if your database and your database login already exists (like when you're hosted by a web hosting provider).
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Αποθήκευση τιμών
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Σύνδεση με το διακομιστή
 DatabaseCreation=Δημιουργία βάσης δεδομένων
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Επιτυχής δημουργία  σύνδεσης του διαχειριστή '<b>%s</b>' στο Dolibarr
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Αποτυχία δημιουργίας λογαριασμού διαχειριστή του Dolibarr.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should remove the <b>install<b> directory or rename it to <b>install.lock</b> in order to avoid its malicious use.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=Η στοχευμένη έκδοση (%s) έχει ένα κενό διάφορες εκδόσεις, ώστε να εγκαταστήσετε οδηγός θα επανέλθει στο επόμενο μετανάστευση προτείνουμε μια φορά αυτό θα τελειώσει.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Μετανάστευση τελειώσει
-LastStepDesc=<strong>Τελευταίο βήμα:</strong> Καθορίστε εδώ login και password που σκοπεύετε να χρησιμοποιήσετε για να συνδεθείτε με το λογισμικό. Να μην χάσετε αυτή, όπως είναι ο λογαριασμός για να επιτρέψει να διαχειριστεί όλες τις άλλες.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Ενεργοποίηση %s ενότητα
 ShowEditTechnicalParameters=Κάντε κλικ εδώ για να δείτε/επεξεργαστείτε προηγμένες παραμέτρους (κατάσταση έμπειρου χρήστη)
-WarningUpgrade=Προσοχή:\nΔημιουργήσατε αντίγραφο της βάσης δεδομένων;\nΑυτό συνιστάται: για παράδειγμα, εξ αιτίας μερικών σφαλμάτων στα συστήματα των βάσεων δεδομένων (για παράδειγμα έκδοση mysql  5.5.40/41/42/43), κάποια δεδομένα ή πίνακες ενδεχομένως να χαθούν κατά τη διάρκεια αυτής της εργασίας, οπότε  συνιστάται να έχετε ένα πλήρες αντίγραφο της βάσης δεδομένων προτού ξεκινήσετε τη μεταφορά δεδομένων.\n\n\nΚάντε Click στο OK για να ξεκινήση η διαδικασία..\n
-ErrorDatabaseVersionForbiddenForMigration=Η έκδοση της βάσης δεδομένων είναι %s. Περιέχει κρίσιμο σφάλμα μπορεί να οδηγεί σε απώλεια δεδομένων σε περίπτωση αλλαγής της δομής της βάσης δεδομένων, όπως απαιτείται κατά την διαδικασία μεταφοράς. Για αυτό το λόγο, η μεταφορά της βάσης δεδομένων δε θα είναι επιτρεπτή μέχρι την αναβάθμισή της νεότερη και διορθωμένη έκδοση (λίστα γνωστών εκδόσεων με σφάλματα: %s)
-KeepDefaultValuesWamp=Χρησιμοποιείτε τον οδηγό εγκατάστασης του Dolibarr από το DoliWamp, οπότε οι προτεινόμενες ρυθμίσεις είναι ήδη προεπιλεγμένες. Αλλάξτε τις μόνο σε περίπτωση που γνωρίζετε ακριβώς τι κάνετε.
-KeepDefaultValuesDeb=Χρησιμοποιείτε τον οδηγό εγκατάστασης του Dolibarr από ένα πακέτο Linux (Ubuntu, Debian, Fedora...), οπότε οι προτεινόμενες ρυθμίσεις είναι ήδη προεπιλεγμένες. Μόνο ο κωδικός του ιδιοκτήτη της βάσης δεδομένων που θα δημιουργηθεί πρέπει να συμπληρωθεί. Αλλάξτε τις υπόλοιπες παραμέτρους μόνο σε περίπτωση που γνωρίζετε ακριβώς τι κάνετε.
-KeepDefaultValuesMamp=Χρησιμοποιείτε τον οδηγό εγκατάστασης του Dolibarr από το DoliMamp, οπότε οι προτεινόμενες ρυθμίσεις είναι ήδη προεπιλεγμένες. Αλλάξτε τις μόνο σε περίπτωση που γνωρίζετε ακριβώς τι κάνετε.
-KeepDefaultValuesProxmox=Χρησιμοποιείτε τον οδηγό εγκατάστασης του Dolibarr από μία εικονική συσκευή Proxmox, οπότε οι προτεινόμενες ρυθμίσεις είναι ήδη προεπιλεγμένες. Αλλάξτε τις μόνο σε περίπτωση που γνωρίζετε ακριβώς τι κάνετε.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Επιτυχής αναβάθμιση
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Επιτυχής διόρθωση κενής ημερομηνίας συμβολαίου
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Ενημέρωση στοιχεία για τις δράσεις
 MigrationPaymentMode=Η μεταφορά δεδομένων για την κατάσταση πληρωμής
 MigrationCategorieAssociation=Μετακίνηση των κατηγοριών
-MigrationEvents=Μετακίνηση γεγονότων για να προσθέσετε ιδιοκτήτη γεγονότων σε πίνακα εκχώρησης
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise
 MigrationRemiseExceptEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Επαναφόρτωση ενθεμάτων %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Εμφάνιση μη διαθέσιμων επιλογών
-HideNotAvailableOptions=Απόκρυψη μη μη διαθέσιμων επιλογών
-ErrorFoundDuringMigration=Αναφέρθηκε σφάλμα κατά τη διαδικασία μεταφοράς, οπότε το επόμενο βήμα δεν είναι δυνατό. Για να αγνοήστε το σφάλμα, μπορείτε να <a href="%s">πατήσετε εδώ</a>, αλλά η εφαρμογή ή κάποιες λειτουργείες μπορεί να μην λειτουργού σωστά μέχρι να διορθωθεί.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index e7d3ba5c85e..a6a087898e8 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Επαφές για αυτό το στοιχείο
 ContactsAddressesForCompany=Επαφές/Διευθύνσεις για αυτό το στοιχείο.
 AddressesForCompany=Διευθύνσεις για αυτό τον Πελ./Προμ.
 ActionsOnCompany=Ενέργειες για αυτό το στοιχείο
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος
 ActionsOnProduct=Events about this product
 NActionsLate=%s καθυστερ.
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Ιστοτοπός
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Αναφορά εξόδων
 ExpenseReports=Αναφορές εξόδων
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 9a9acb30595..75a7503bb30 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Συνδεδεμένα αντικείμενα
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=Σύνδεσμος URL της σελίδας
 WEBSITE_TITLE=Τίτλος
 WEBSITE_DESCRIPTION=Περιγραφή
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Λέξεις κλειδιά
 LinesToImport=Lines to import
diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
index 40f9ec273a7..20d737872ff 100644
--- a/htdocs/langs/el_GR/paybox.lang
+++ b/htdocs/langs/el_GR/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Paybox μονάδα ρύθμισης
 PayBoxDesc=Αυτή η ενότητα παρέχει τις σελίδες για να καταστεί δυνατή πληρωμή <a href="http://www.paybox.com" target="_blank">Paybox</a> από τους πελάτες. Αυτό μπορεί να χρησιμοποιηθεί για μια ελεύθερη πληρωμής ή πληρωμή σε ένα συγκεκριμένο αντικείμενο του Dolibarr (τιμολόγιο, ώστε, ...)
 FollowingUrlAreAvailableToMakePayments=Μετά από τις διευθύνσεις URL είναι διαθέσιμοι να προσφέρουν μια σελίδα σε έναν πελάτη να προβεί σε πληρωμή σε Dolibarr αντικείμενα
 PaymentForm=Έντυπο πληρωμής
-WelcomeOnPaymentPage=Καλώς ήρθατε στην online υπηρεσία πληρωμών μας
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Αυτή η οθόνη σας επιτρέπει να κάνετε μια online πληρωμή %s.
 ThisIsInformationOnPayment=Πρόκειται για πληροφορίες σχετικά με την πληρωμή να γίνει
 ToComplete=Για να ολοκληρώσετε
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL για να προσφέρει μια
 ToOfferALinkForOnlinePaymentOnContractLine=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για μια γραμμή σύμβαση
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για ένα ελεύθερο ποσό
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL για να προσφέρει μια %s online διεπαφή χρήστη πληρωμή για μια συνδρομή μέλους
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Μπορείτε επίσης να προσθέσετε την παράμετρο url <b>&amp; tag = <i>αξία</i></b> σε κανένα από αυτά τα URL (απαιτείται μόνο για την ελεύθερη πληρωμής) για να προσθέσετε το δικό σας σχόλιο ετικέτα πληρωμής.
-SetupPayBoxToHavePaymentCreatedAutomatically=Ρύθμιση Paybox σας με <b>%s</b> url να έχουν πληρωμής δημιουργείται αυτόματα όταν επικυρωθεί από paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Η σελίδα αυτή επιβεβαιώνει ότι η πληρωμή σας έχει καταγραφεί. Σας ευχαριστώ.
-YourPaymentHasNotBeenRecorded=Η πληρωμή σας δεν έχει καταγραφεί και η συναλλαγή έχει ακυρωθεί. Σας ευχαριστώ.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Παράμετροι λογαριασμού
 UsageParameter=Παράμετροι χρήσης
 InformationToFindParameters=Βοήθεια για να βρείτε %s τα στοιχεία του λογαριασμού σας
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index 24a2fe50590..0f5d537ad71 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Υπογραφή (ανάγκες χρέωσης)
 PropalStatusNotSigned=Δεν έχει υπογραφεί (κλειστό)
 PropalStatusBilled=Χρεώνεται
 PropalStatusDraftShort=Προσχέδιο
-PropalStatusValidatedShort=Επικυρώθηκε
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Κλειστό
 PropalStatusSignedShort=Υπογραφή
 PropalStatusNotSignedShort=Δεν έχει υπογραφεί
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Η Προσφορά %s δεν βρέθηκε
 AddToDraftProposals=Προσθήκη στο σχέδιο Προσφοράς
 NoDraftProposals=Δεν υπάρχουν σχέδια Προσφορών
 CopyPropalFrom=Δημιουργία Προσφοράς με την αντιγραφή υφιστάμενης Προσφοράς
-CreateEmptyPropal=Δημιουργία κενών Προσφορών ή από την λίστα των προϊόντων / υπηρεσιών
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Προεπιλογή διάρκεια Προσφοράς ισχύος (σε ημέρες)
-UseCustomerContactAsPropalRecipientIfExist=Χρησιμοποιήστε διεύθυνση επικοινωνίας του πελάτη, εάν αυτή ορίζεται αντί του ΠΕΛ./ΠΡΟΜ. διεύθυνση ως διεύθυνση παραλήπτη Προσφοράς
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Κλώνος Προσφοράς
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Πελάτης επαφή που παρακ
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Ένα πλήρες μοντέλο Προσφοράς (logo. ..)
+DocModelCyanDescription=Ένα πλήρες μοντέλο Προσφοράς (logo. ..)
 DefaultModelPropalCreate=Δημιουργία προεπιλεγμένων μοντέλων
 DefaultModelPropalToBill=Προεπιλεγμένο πρότυπο όταν κλείνει μια Προσφορά (να τιμολογηθεί)
 DefaultModelPropalClosed=Προεπιλεγμένο πρότυπο όταν κλείνει μια Προσφορά (ατιμολόγητη)
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 4c1415912ee..9d37e72b45b 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Κώδικας
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Διαγραφή ιστοχώρου
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Βιβλιοθήκη πολυμέσων
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Επεξεργασία μενού
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Η προεπισκόπιση της ιστοσελίδας σας <strong>%s</strong> δεν είναι δυνατή. Πρέπει πρώτα να προσθέσετε μια σελίδα.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=Προβολή σελίδας σε νέα καρτέλα
 SetAsHomePage=Ορισμός σαν αρχική σελίδα
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Ανάγνωση
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 988f51b6d8f..5617fe77778 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -39,5 +39,4 @@ GeneratedOn=Built on %s
 Canceled=Cancelled
 Color=Colour
 NoPhotoYet=No picture available yet
-WebSite=Website
 SearchIntoSupplierProposals=Vendor quotes
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 37a1d03a2d3..5bc061f31f3 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -164,5 +164,4 @@ AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-BankAccountReleveModule=Module Bank statement
-AutoReportLastAccountStatement=Automatic report account stament
+AutoReportLastAccountStatement=Automaticaly fill the field 'numero of bank statement' with last statement numero when making reconciliation
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 1c89de928ca..43ddd3bf36f 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index bcca348c861..c92d83988ff 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -200,6 +200,7 @@ MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show unavailable options
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 3513bb95452..54fe556a5a0 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Opción deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionaliad disponible únicamente en versiones oficiales estables
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Los módulos de Dolibarr definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado para activar/desactivar un módulo/aplicación.
+ModulesDesc=Los módulos/aplicaciones definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado (al final de la línea del módulo) para activar/desactivar un módulo/aplicación.
 ModulesMarketPlaceDesc=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para instalar un módulo externo. El módulo estará entonces visible en la pestaña <strong>%s</strong>.
 ModulesMarketPlaces=Buscar módulos externos...
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Módulos herramientas o Sistema
 ModuleFamilyExperimental=Módulos experimentales
 ModuleFamilyFinancial=Módulos financieros (Contabilidad/tesorería)
 ModuleFamilyECM=Gestión Electrónica de Documentos (GED)
-ModuleFamilyPortal=Sitios Web y otras aplicaciones frontales
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces con sistemas extrenos
 MenuHandlers=Gestores menú
 MenuAdmin=Editor menú
@@ -463,9 +463,9 @@ ClickToShowDescription=Clic para ver la descripción
 DependsOn=Este módulo necesita el módulo(s)
 RequiredBy=Este módulo es requerido por los módulos
 TheKeyIsTheNameOfHtmlField=Este es el nombre del del campo HTML. Son necesarios tener conocimientos técnicos para leer el contenido de la página HTML para obtener el nombre clave de un campo.
-PageUrlForDefaultValues=Debe introducir aquí la URL relativa de la página. Si incluye parámetros en la URL, los valores predeterminados serán efectivos si todos los parámetros están configurados con el mismo valor. Ejemplos:
-PageUrlForDefaultValuesCreate=<br> Para que el formulario cree un nuevo tercero, es <strong> %s</strong>, <br> Si queremos que el valor predeterminado sea sólo una url con algún parámetro, podemos usar <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Para la página que lista terceros, es <strong>%s</strong>,<br>si queremos que el valor predeterminado sea sólo una url con algún parámetro, podemos usar <strong>%s</strong>
+PageUrlForDefaultValues=Debe introducir aquí la URL relativa de la página. Si incluye parámetros en la URL, los valores predeterminados serán efectivos si todos los parámetros están configurados con el mismo valor.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Habilitar el uso de valores predeterminados personalizados
 EnableOverwriteTranslation=Habilitar el uso de la traducción sobrescrita
 GoIntoTranslationMenuToChangeThis=Se ha encontrado una traducción para la clave con este código. Para cambiar este valor, debe editarlo desde Inicio-Configuración-Traducción.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=El directorio raíz donde se cargan manualmente todos l
 Module0Name=Usuarios y grupos
 Module0Desc=Gestión de Usuarios / Empleados y grupos
 Module1Name=Terceros
-Module1Desc=Gestión de terceros (empresas, particulares) y contactos
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Comercial
 Module2Desc=Gestión comercial
 Module10Name=Contabilidad
@@ -501,7 +501,7 @@ Module23Desc=Realiza el seguimiento del consumo de energías
 Module25Name=Pedidos de clientes
 Module25Desc=Gestión de pedidos de clientes
 Module30Name=Facturas y abonos
-Module30Desc=Gestión de facturas y abonos a clientes. Gestión facturas de proveedores
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Proveedores
 Module40Desc=Proveedores y gestión de compras (pedidos de compra y facturación)
 Module42Name=Registros de depuración
@@ -902,7 +902,7 @@ DictionaryVAT=Tasa de IVA (Impuesto sobre ventas en EEUU)
 DictionaryRevenueStamp=Importes de sellos fiscales
 DictionaryPaymentConditions=Condiciones de pago
 DictionaryPaymentModes=Modos de pago
-DictionaryTypeContact=Tipos de contactos/direcciones
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Tipo de página/contenedor
 DictionaryEcotaxe=Baremos CEcoParticipación (DEEE)
 DictionaryPaperFormat=Formatos de papel
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Los informes se basan en el total de las ventas
 LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de traducción o cadena
+ValueOfConstantKey=Value of constant
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
 CurrentNext=Actual/Siguiente
@@ -1053,7 +1054,7 @@ SetupDescription3=Los parámetros del menú <a href="%s">%s->%s</a> <br>Parámet
 SetupDescription4=<a href="%s">%s -> %s</a> <br>Dolibarr ERP/CRM es una colección de varios módulos, todos más o menos independientes. Los módulos relevantes para tus necesidades deben ser activados y configurados. Se añadirán nuevas funcionalidades a los menús por cada módulo que se active.
 SetupDescription5=Las otras entradas de configuración gestionan parámetros opcionales.
 LogEvents=Auditoría de la seguridad de eventos
-Audit=Auditoría
+Audit=Security events
 InfoDolibarr=Acerca de Dolibarr
 InfoBrowser=Acerca del Navegador
 InfoOS=Acerca del SO
@@ -1065,7 +1066,7 @@ BrowserName=Nombre del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr
 SecurityEventsPurged=Eventos de seguridad purgados
-LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí. Los administradores pueden ver su contenido a través de menú <b>Herramientas del sistema - Auditoría</b>.Atención, esta característica puede consumir una gran cantidad de datos en la base de datos.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Los parámetros de configuración solamente pueden ser tratados por <b>usuarios administrador</b>
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Salto de rango de redondeo (para países donde el redonde
 UnitPriceOfProduct=Precio unitario sin IVA de un producto
 TotalPriceAfterRounding=Precio total después del redondeo
 ParameterActiveForNextInputOnly=Parámetro efectivo solamente a partir de las próximas sesiones
-NoEventOrNoAuditSetup=No se han registrado eventos de seguridad. Esto puede ser normal si la auditoría no ha sido habilitada en la página "configuración->seguridad->auditoría".
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No se han encontrado eventos de seguridad para tales criterios de búsqueda.
 SeeLocalSendMailSetup=Ver la configuración local de sendmail
 BackupDesc=Para realizar una copia de seguridad completa de Dolibarr, usted debe:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Campos adicionales (plantillas de líneas de facturas)
 ExtraFieldsSupplierOrdersLines=Campos adicionales (líneas de pedido)
 ExtraFieldsSupplierInvoicesLines=Campos adicionales (líneas de factura)
 ExtraFieldsThirdParties=Campos adicionales (terceros)
-ExtraFieldsContacts=Campos adicionales (contactos/direcciones)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Campos adicionales (miembros)
 ExtraFieldsMemberType=Campos adicionales  (tipos de miembros)
 ExtraFieldsCustomerInvoices=Campos adicionales (facturas a clientes)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Listado de notificaciones por usuario*
 ListOfNotificationsPerUserOrContact=Listado de notificaciones por usuario* o por contacto**
 ListOfFixedNotifications=Listado de notificaciones fijas
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para añadir o elliminar notificaciones a usuarios
-GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un tercero para añadir o eliminar notificaciones a contactos/direcciones
+GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un contacto de tercero para añadir o eliminar notificaciones para contactos/direcciones
 Threshold=Valor mínimo/umbral
 BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos
 SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Confirmación recolección e-mail
 EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector ahora?
 NoNewEmailToProcess=No hay e-mails nuevos (filtros coincidentes) para procesar
 NothingProcessed=Nada hecho
-XEmailsDoneYActionsDone=%s e-mails analizados, %s e-mails procesados ​​con éxito (para %s registro/acciones realizadas) por el recolector
-RecordEvent=Registro de evento
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Crear lead (y tercero si es necesario)
 CodeLastResult=Código de resultado de la última recogida
 NbOfEmailsInInbox=Número de emails en el directorio fuente
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Código postal
 ##### Resource ####
 ResourceSetup=Configuración del módulo Recursos
 UseSearchToSelectResource=Utilice un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 4d4dcf98583..1931e2ced91 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -164,3 +164,5 @@ AddVariousPayment=Añadir pagos varios
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 5c0b63a2aa0..5e52c2f4618 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -465,7 +465,7 @@ Cheques=Cheques
 DepositId=Id. depósito
 NbCheque=Número de cheques
 CreditNoteConvertedIntoDiscount=Este %s ha sido convertido en %s
-UsBillingContactAsIncoiveRecipientIfExist=Utilizar la dirección del contacto de cliente de facturación de la factura en vez de la dirección del tercero como destinatario de las facturas
+UsBillingContactAsIncoiveRecipientIfExist=Usar contacto/dirección de tipo 'contacto facturación' en lugar de la dirección del tercero como destinatario de las facturas
 ShowUnpaidAll=Mostrar todos los pendientes
 ShowUnpaidLateOnly=Mostrar los pendientes en retraso solamente
 PaymentInvoiceRef=Pago factura %s
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 63cf90861ca..f5158188810 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -32,10 +32,13 @@ DeleteArticle=Haga clic para quitar este artículo
 FilterRefOrLabelOrBC=Búsqueda (Ref/Etiq.)
 UserNeedPermissionToEditStockToUsePos=Ha configurado el decremento de stock en la creación de facturas, por lo que el usuario que utilice el TPV deberá tener permiso para editar stock.
 DolibarrReceiptPrinter=Impresora de tickets Dolibarr
-CloseBill=Cerrar venta
-Floors=Salones
-Floor=Salón
-AddTable=Añadir mesa
-Place=Puesto
-TakeposConnectorNecesary=TakePOS Connector requerido
-OrderPrinters=Impresoras de pedido
+PointOfSale=Terminales Punto de Venta
+PointOfSaleShort=POS
+CloseBill=Cerrar factura
+Floors=Pisos
+Floor=Piso
+AddTable=Agregar tabla
+Place=Lugar
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Impresoras de pedidos
+SearchProduct=Buscar producto
diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang
index e66686b4c51..3282ed02af9 100644
--- a/htdocs/langs/es_ES/dict.lang
+++ b/htdocs/langs/es_ES/dict.lang
@@ -295,7 +295,7 @@ CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=milésimo
 #### Input reasons #####
-DemandReasonTypeSRC_INTE=Internetaaa
+DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Campaña correo
 DemandReasonTypeSRC_CAMP_EMAIL=Campaña E-Mailing
 DemandReasonTypeSRC_CAMP_PHO=Campaña telefónica
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Boca a boca
 DemandReasonTypeSRC_PARTNER=Socio
 DemandReasonTypeSRC_EMPLOYEE=Empleado
 DemandReasonTypeSRC_SPONSORING=Patrocinador
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formato 4A0
 PaperFormatEU2A0=Formato 2A0
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index 9c8bacea31b..eb6b96507c8 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nº de documentos
+ECMNbOfDocs=Nº de documentos en el directorio
 ECMSection=Directorio
 ECMSectionManual=Directorio manual
 ECMSectionAuto=Directorio automático
@@ -34,18 +34,19 @@ ECMDocsByProjects=Documentos enlazados a proyectos
 ECMDocsByUsers=Documentos enlazados a usuarios
 ECMDocsByInterventions=Documentos enlazados a intervenciones
 ECMDocsByExpenseReports=Documentos enlazados a informes de gastos
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No se ha creado el directorio
 ShowECMSection=Mostrar directorio
 DeleteSection=Eliminación directorio
 ConfirmDeleteSection=¿Está seguro de querer eliminar el directorio <b>%s</b>?
 ECMDirectoryForFiles=Directorio relativo para archivos
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=No se puede eliminar porque contiene archivos o subdirectorios
+CannotRemoveDirectoryContainsFiles=No se puede eliminar porque contiene archivos
 ECMFileManager=Explorador de archivos
 ECMSelectASection=Seleccione un directorio en el árbol de la izquierda
 DirNotSynchronizedSyncFirst=Este directorio fue creado o modificado fuera del módulo GED. Haga clic en el botón "Actualizar" para resincronizar la información del disco y la base  de datos para ver el contenido de ese directorio.
 ReSyncListOfDir=Resincronizar la lista de directorios
 HashOfFileContent=Hash de contenido de archivo
-FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a cargarlo)
-FileSharedViaALink=Archivo compartido a través de un enlace
 NoDirectoriesFound=No se encontraron directorios
+FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a cargarlo)
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index b684ad1b158..4a7422082c2 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=El cliente SOAP ha fallado con el error '%s'
 ErrorGlobalVariableUpdater5=Sin variable global seleccionada
 ErrorFieldMustBeANumeric=El campo <b>%s</b> debe contener un valor numérico
 ErrorMandatoryParametersNotProvided=Los parámetro(s) obligatorio(s) no están todavía definidos
-ErrorOppStatusRequiredIfAmount=Ha indicado un importe estimado para esta oportunidad/lead. Debe indicar también su estado
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Error al cargar el descriptor de clase del módulo %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la matriz de menú en el descriptor del módulo (valor incorrecto para la clave fk_menu)
 ErrorSavingChanges=Ha ocurrido un error al guardar los cambios
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para las líneas libres
 ErrorAPageWithThisNameOrAliasAlreadyExists=La página/contenedor <strong>%s</strong> tiene el mismo nombre o alias alternativo que el que intenta utilizar
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/help.lang b/htdocs/langs/es_ES/help.lang
index 064d8382d7d..8c1d9c59b6b 100644
--- a/htdocs/langs/es_ES/help.lang
+++ b/htdocs/langs/es_ES/help.lang
@@ -6,7 +6,7 @@ OtherSupport=Otros tipos de asistencia
 ToSeeListOfAvailableRessources=Para contactar/ver los recursos disponibles:
 HelpCenter=Centro de asistencia
 DolibarrHelpCenter=Centro de soporte y ayuda Dolibarr
-ToGoBackToDolibarr=Haga clic <a href="%s">aquí para utilizar Dolibarr</a>
+ToGoBackToDolibarr=De lo contrario, <a href="%s">haga clic aquí para continuar usando Dolibarr</a>.
 TypeOfSupport=Tipo de soporte
 TypeSupportCommunauty=Comunitario (gratuito)
 TypeSupportCommercial=Comercial
@@ -16,11 +16,8 @@ Efficiency=Eficacia
 TypeHelpOnly=Sólamente ayuda
 TypeHelpDev=Ayuda+Desarrollo
 TypeHelpDevForm=Ayuda+Desarrollo+Formación
-ToGetHelpGoOnSparkAngels1=Algunas empresas o independientes ofrecen servicios de apoyo muy rápido (a veces de inmediato) y más eficientes gracias a la capacidad de control remoto de su equipo para ayudar a diagnosticar y resolver sus problemas. Esta asistencia se puede encontrar en la bolsa de asistentes de <b>%s</b>:
-ToGetHelpGoOnSparkAngels3=Para acceder a la búsqueda de <b>asistentes disponibles</b>, haga clic aquí
-ToGetHelpGoOnSparkAngels2=En ocasiones, ningún operador se encuentra disponible en el momento de su búsqueda, no olvide cambiar los criterios de búsqueda indicando "todos los disponibles". Puede, entonces, ponerse en contacto en diferido.
-BackToHelpCenter=Sino, haga clic aquí para <a href="%s"> volver al centro de asistencia</a>.
-LinkToGoldMember=En caso contrario, puede llamar inmediatamente a uno de los asistentes preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su widget (disponibilidad y tarifa máxima actualizadas automáticamente):
+BackToHelpCenter=De lo contrario, <a href="%s">vuelva a la página de inicio del Centro de ayuda</a>.
+LinkToGoldMember=Puede llamar a uno de los formadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (el estado y el precio máximo se actualizan automáticamente):
 PossibleLanguages=Idiomas disponibles
 SubscribeToFoundation=Ayude al proyecto Dolibarr, adhiérase a la asociación Dolibarr
 SeeOfficalSupport=Para obtener soporte oficial Dolibarr en su idioma: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index c66e6c7122c..dfdc9c2453b 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -112,7 +112,7 @@ NoticePeriod=Plazo de aviso
 HolidaysToValidate=Días libres retribuidos a validar
 HolidaysToValidateBody=A continuación encontrará una solicitud de días libres retribuidos para validar
 HolidaysToValidateDelay=Esta solicitud de días libres retribuidos tendrá lugar en un plazo de menos de %s días.
-HolidaysToValidateAlertSolde=El usuario que ha realizado la solicitud de días retribuidos no dispone de suficientes días disponibles.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Días libres retribuidos validados
 HolidaysValidatedBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido validada.
 HolidaysRefused=Días libres retribuidos denegados
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index e04d87cb352..3ec51aa9d80 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -17,7 +17,7 @@ PHPSupportUTF8=Este PHP soporta las funciones UTF8.
 PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
 Recheck=Haga click aquí para realizar un test más exhaustivo
-ErrorPHPDoesNotSupportSessions=Su instalación PHP no soporta las sesiones. Esta funcionalidad es necesaria para hacer funcionar a Dolibarr. Compruebe su configuración de PHP.
+ErrorPHPDoesNotSupportSessions=Su instalación PHP no soporta las sesiones. Esta funcionalidad es necesaria para hacer funcionar a Dolibarr. Compruebe su configuración de PHP y los permisos del directorio de sesiones.
 ErrorPHPDoesNotSupportGD=Este PHP no soporta las funciones gráficas GD. Ningún gráfico estará disponible.
 ErrorPHPDoesNotSupportCurl=Su PHP no soporta Curl.
 ErrorPHPDoesNotSupportUTF8=Este PHP no soporta las funciones UTF8. Resuelva el problema antes de instalar Dolibarr ya que no podrá funcionar correctamente.
@@ -50,17 +50,18 @@ ServerPortDescription=Puerto del servidor de la base de datos. Dejar en blanco s
 DatabaseServer=Servidor de la base de datos
 DatabaseName=Nombre de la base de datos
 DatabasePrefix=Prefijo para las tablas
-AdminLogin=Usuario del administrador de la base de datos Dolibarr. Deje vacío si se conecta en anonymous
+DatabasePrefixDescription=Prefijo de tabla de base de datos. Si está vacío, el valor predeterminado es llx_.
+AdminLogin=Usuario del administrador de la base de datos Dolibarr.
 PasswordAgain=Verificación de la contraseña
 AdminPassword=Contraseña del administrador de la base de datos Dolibarr. Deje vacío si se conecta en anonymous
 CreateDatabase=Crear la base de datos
 CreateUser=Crear propietario o concederle permiso en la base de datos
 DatabaseSuperUserAccess=Base de datos - Acceso super usuario
-CheckToCreateDatabase=Seleccione esta opción si la base de datos no existe y debe crearse. En este caso, es necesario indicar usuario/contraseña del superusuario más adelante en esta página.
-CheckToCreateUser=Seleccione esta opción si el propietario de la base de datos no existe y debe ser creado, o si existe pero la base de datos no existe y se deben conceder permisos.<br> En este caso, debes elegir el login y contraseña y también rellenar el login/contraseña para la cuenta de superusuario en la parte inferior de esta página. Si esta opción no está seleccionada, el propietario de la base de datos y su contraseña deben existir.
-DatabaseRootLoginDescription=Usuario de la base que tiene los derechos de creación de bases de datos o cuenta para la base de datos, inútil si la base de datos y su usuario ya existen (como cuando están en un anfitrión).
-KeepEmptyIfNoPassword=Deje vacío si el usuario no tiene contraseña
-SaveConfigurationFile=Grabación del archivo de configuración
+CheckToCreateDatabase=Seleccione esta opción si la base de datos no existe y debe crearse.<br>En este caso, es necesario indicar usuario/contraseña del superusuario más adelante en esta página.
+CheckToCreateUser=Seleccione esta opción si: <br>el usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o<br>si el usuario existe pero la base de datos no existe y se deben otorgar permisos.<br>En este caso, debe ingresar la cuenta de usuario y la contraseña, y <b>también</b> el nombre de la cuenta del superusuario y la contraseña en la parte inferior de esta página. Si esta opción no está marcada, el propietario de la base de datos y la contraseña ya deben existir.
+DatabaseRootLoginDescription=Nombre de la cuenta de superusuario (para crear nuevas bases de datos o nuevos usuarios), obligatorio si la base de datos o su propietario aún no existen.
+KeepEmptyIfNoPassword=Deje vacío si el usuario no tiene contraseña (NO recomendado)
+SaveConfigurationFile=Guardando parámetros para
 ServerConnection=Conexión al servidor
 DatabaseCreation=Creación de la base de datos
 CreateDatabaseObjects=Creación de los objetos de la base de datos
@@ -81,15 +82,15 @@ YouNeedToPersonalizeSetup=Ahora debe configurar Dolibarr según sus necesidades
 AdminLoginCreatedSuccessfuly=Inicio de sesión del administrador de Dolibarr  '<b>%s</b>' creado correctamente
 GoToDolibarr=Acceso a Dolibarr
 GoToSetupArea=Acceso a Dolibarr (área de configuración)
-MigrationNotFinished=La versión de su base de datos aún no está completamente a nivel, por lo que tendrá que reiniciar una migración.
+MigrationNotFinished=La versión de la base de datos no está completamente actualizada: vuelva a ejecutar el proceso de actualización.
 GoToUpgradePage=Acceder a la página de migración de nuevo
 WithNoSlashAtTheEnd=Sin el signo "/" al final
-DirectoryRecommendation=Se recomienda poner este directorio fuera del directorio de las páginas web.
+DirectoryRecommendation=Se recomienda utilizar un directorio fuera de las páginas web.
 LoginAlreadyExists=Ya existe
 DolibarrAdminLogin=Login del usuario administrador de Dolibarr
 AdminLoginAlreadyExists=La cuenta de administrador Dolibarr '<b>%s</b>' ya existe. Vuelva atrás si desea crear otra.
 FailedToCreateAdminLogin=No se pudo crear la cuenta de administrador Dolibarr.
-WarningRemoveInstallDir=Atención, por razones de seguridad, con el fin de bloquear un nuevo uso de las herramientas de instalación/actualización, es aconsejable crear en el directorio raíz de Dolibarr un archivo llamado <b>install.lock</b> en solo lectura.
+WarningRemoveInstallDir=Atención, por razones de seguridad, con el fin de bloquear un nuevo uso de las herramientas de instalación/actualización, es aconsejable crear en el directorio de documentos de Dolibarr un archivo llamado <b>install.lock</b> en solo lectura para prevenir el uso accidental/malicioso de las herramientas de instalación nuevamente.
 FunctionNotAvailableInThisPHP=No disponible en este PHP
 ChoosedMigrateScript=Elección del script de migración
 DataMigration=Migración de los datos (datos)
@@ -103,19 +104,19 @@ UpgradeDesc=Utilice este método después de haber actualizado los archivos de u
 Start=Empezar
 InstallNotAllowed=Instalación no autorizada por los permisos del archivo <b>conf.php</b>
 YouMustCreateWithPermission=Debe crear un archivo %s y darle los derechos de escritura al servidor web durante el proceso de instalación.
-CorrectProblemAndReloadPage=Corrija el problema y <a href="%s">recargue la página</a> (Tecla F5).
+CorrectProblemAndReloadPage=Por favor, solucione el problema y presione F5 para volver a cargar la página.
 AlreadyDone=Ya migrada
 DatabaseVersion=Versión de la base de datos
 ServerVersion=Versión del servidor de la base de datos
 YouMustCreateItAndAllowServerToWrite=Debe crear este directorio y permitir al servidor web escribir en él.
 DBSortingCollation=Orden de selección utilizado para la base de datos
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Quiso crear la base de datos <b>%s</b>, pero para ello Dolibarr debe conectarse con el servidor <b>%s</b> vía el superusuario <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Quiso crear el login de acceso a la base de datos <b>%s</b>, pero para ello Dolibarr debe conectarse con el servidor <b>%s</b> via el superusuario <b>%s</b>.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Quiso crear la base de datos <b>%s</b>, pero para ello Dolibarr debe conectarse con el servidor <b>%s</b> mediante el superusuario <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Quiso crear la base de datos <b>%s</b>, pero para ello Dolibarr debe conectarse con el servidor <b>%s</b> mediante el superusuario <b>%s</b>.
 BecauseConnectionFailedParametersMayBeWrong=La conexión falla, los parámetros del servidor o el superusuario pueden ser incorrectos.
 OrphelinsPaymentsDetectedByMethod=Pagos huérfanos detectados por el método %s
 RemoveItManuallyAndPressF5ToContinue=Suprimalo manualmente y pulse F5 para continuar.
 FieldRenamed=Campo renombrado
-IfLoginDoesNotExistsCheckCreateUser=Si el login aún no existe, debe seleccionar la opción "Creación del usuario"
+IfLoginDoesNotExistsCheckCreateUser=Si el usuario aún no existe, debe seleccionar la opción "Creación del usuario"
 ErrorConnection=El servidor "<b>%s</b>", base de datos "<b>%s</b>", login "<b>%s</b>", o la contraseña de la base de datos pueden ser incorrectos o la versión de PHP muy vieja en comparación con la versión de la base de datos.
 InstallChoiceRecommanded=Opción recomendada para instalar la versión <b>%s</b> sobre su actual versión <b>%s</b>
 InstallChoiceSuggested=<b>Opción sugerida por el instalador</b>.
@@ -124,21 +125,21 @@ CheckThatDatabasenameIsCorrect=Compruebe que el nombre de la base de datos "<b>%
 IfAlreadyExistsCheckOption=Si el nombre es correcto y la base de datos no existe, debe seleccionar la opción "Crear la base de datos"
 OpenBaseDir=Parámetro php openbasedir
 YouAskToCreateDatabaseSoRootRequired=Ha marcado la casilla "Crear la base de datos". Para ello, el usuario/contraseña del superusuario (al final del formulario) son obligatorios.
-YouAskToCreateDatabaseUserSoRootRequired=Ha marcado la casilla "Crear el usuario propietario" de la base de datos. Para ello, el usuario/contraseña del superusuario (al final del formulario) son obligatorios.
+YouAskToCreateDatabaseUserSoRootRequired=Ha marcado la opción "Crear el usuario propietario" de la base de datos. Para ello, el usuario/contraseña del superusuario (al final del formulario) son obligatorios.
 NextStepMightLastALongTime=El siguiente paso puede tardar varios minutos. Después de haber validado, le agradecemos espere a la completa visualización de la página siguiente para continuar.
 MigrationCustomerOrderShipping=Actualización de los datos de expediciones de pedidos de clientes
 MigrationShippingDelivery=Actualización de los datos de expediciones
 MigrationShippingDelivery2=Actualización de los datos de expediciones 2
 MigrationFinished=Actualización terminada
-LastStepDesc=<strong>Último paso</strong>: Indique aquí la cuenta y la contraseña del primer usuario que usted utilizará para conectarse a la aplicación. No pierda estos identificadores, es la cuenta que permite administrar el resto.
+LastStepDesc=<strong>Último paso</strong>: Indique aquí el usuario y la contraseña que utilizará para conectarse a la aplicación. <b>No pierda estos identificadores, es la cuenta que permite administrar el resto</b>.
 ActivateModule=Activación del módulo %s
 ShowEditTechnicalParameters=Pulse aquí para ver/editar los parámetros técnicos (modo experto)
-WarningUpgrade=Advertencia: \\\n¿Ha realizado una copia de seguridad de su base de datos antes? \\\nEsto es altamente recomendado: por ejemplo, debido a algunos errores en los sistemas de bases de datos (por ejemplo MySQL versión 5.5.40/41/42/43), algunos datos o tablas pueden perderse durante este proceso, por lo que es altamente recomendado tener un volcado completo de la base de datos antes de iniciar la actualización.\\\n\\\nHaga clic en Aceptar para iniciar el proceso de actualización...
+WarningUpgrade=Advertencia: \\\n¿Ha realizado una copia de seguridad de su base de datos antes? \\\nEsto es altamente recomendado: por ejemplo, debido a algunos errores en los sistemas de bases de datos (por ejemplo MySQL versión 5.5.40/41/42/43), algunos datos o tablas pueden perderse durante este proceso, por lo que es altamente recomendado tener un volcado completo de la base de datos antes de iniciar la actualización.\n\nHaga clic en Aceptar para iniciar el proceso de actualización...
 ErrorDatabaseVersionForbiddenForMigration=Su versión de base de datos es la %s. Tiene un error crítico que hace que pierda los datos si cambia la estructura de la base de datos, como esto es necesario para el proceso de actualización, este no se va a realizar hasta que actualice su base de datos a una versión mayor con el error subsanado (listado de versiones conocidas con este error: %s)
-KeepDefaultValuesWamp=Está utilizando el asistente de instalación DoliWamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
-KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete Linux (Ubuntu, Debian, Fedora...), los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información sólamente si está seguro de ello.
-KeepDefaultValuesMamp=Está utilizando el asistente de instalación DoliMamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
-KeepDefaultValuesProxmox=Está utilizando el asistente de instalación Dolibarr desde una máquina virtual Proxmox, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
+KeepDefaultValuesWamp=Está utilizando el asistente de instalación DoliWamp, los valores propuestos aquí están optimizados. Cámbielos solamente si está seguro de ello.
+KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete Linux (Ubuntu, Debian, Fedora...), los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información solamente si está seguro de ello.
+KeepDefaultValuesMamp=Está utilizando el asistente de instalación DoliMamp, los valores propuestos aquí están optimizados. Cámbielos solamente si está seguro de ello.
+KeepDefaultValuesProxmox=Está utilizando el asistente de instalación Dolibarr desde una máquina virtual Proxmox, los valores propuestos aquí están optimizados. Cámbielos solamente si está seguro de ello.
 UpgradeExternalModule=Ejecutar proceso dedicado para actualizar módulos externos
 SetAtLeastOneOptionAsUrlParameter=Establezca al menos una opción como parámetro en URL. Por ejemplo: '... repair.php?standard=confirmed'
 NothingToDelete=Nada para limpiar/eliminar
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Migración de datos de los pedidos a proveedores
 MigrationProposal=Migración de datos de presupuestos
 MigrationInvoice=Migración de datos de las facturas a clientes
 MigrationContract=Migración de datos de los contratos
-MigrationSuccessfullUpdate=Actualización con éxito
+MigrationSuccessfullUpdate=Actualización finalizada
 MigrationUpdateFailed=La actualización ha fallado
 MigrationRelationshipTables=Migración de las tablas de relación (%s)
 MigrationPaymentsUpdate=Actualización de los pagos (vínculo n-n pagos-facturas)
@@ -193,18 +194,19 @@ MigrationProjectTaskTime=Actualización de tiempo dedicado en segundos
 MigrationActioncommElement=Actualización de los datos de acciones sobre elementos
 MigrationPaymentMode=Actualización de los modos de pago
 MigrationCategorieAssociation=Actualización de las categorías
-MigrationEvents=Migración de eventos para agregar propietario de evento en la tabla de asignacion
+MigrationEvents=Migración de eventos para agregar propietario de evento en la tabla de asignación
 MigrationEventsContact=Migración de eventos para agregar contacto de evento en la tabla de asignación
 MigrationRemiseEntity=Actualizando el campo entity de llx_societe_remise
 MigrationRemiseExceptEntity=Actualizando el campo entity de llx_societe_remise_except
 MigrationUserRightsEntity=Actualizando el campo entity de llx_user_rights
 MigrationUserGroupRightsEntity=Actualizando el campo entity de llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Recargar módulo %s
 MigrationResetBlockedLog=Restablecer el módulo BlockedLog para el algoritmo v7
 ShowNotAvailableOptions=Mostrar opciones no disponibles
 HideNotAvailableOptions=Ocultar opciones no disponibles
 ErrorFoundDuringMigration=Se ha producido un error durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar errores puede <a href="%s">hacer clic aquí</a>, pero la aplicación a algunas funcionalidades pueden no funcionar correctamente mientras no se arregle el problema.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+YouTryInstallDisabledByDirLock=La aplicación intenta instalar la actualización, pero las páginas de instalación/actualización se han desactivado por razones de seguridad (el nombre del directorio se ha cambiado con el sufijo .lock). <br>
+YouTryInstallDisabledByFileLock=La aplicación intenta instalar la actualización, pero las páginas de instalación/actualización se han desactivado por razones de seguridad (mediante el archivo de bloqueo <strong>install.lock</strong> del directorio de documentos de dolibarr). <br>
+ClickHereToGoToApp=Haga clic aquí para ir a su aplicación
+ClickOnLinkOrRemoveManualy=Haga clic en el siguiente enlace y si siempre llega a esta página, debe eliminar manualmente el archivo install.lock del directorio de documentos
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 8a3079d4212..a34f3a52899 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contactos de este tercero
 ContactsAddressesForCompany=Contactos/direcciones de este tercero
 AddressesForCompany=Direcciones de este tercero
 ActionsOnCompany=Eventos respecto a este tercero
+ActionsOnContact=Eventos sobre este contacto/dirección
 ActionsOnMember=Eventos respecto a este miembro
 ActionsOnProduct=Eventos sobre este producto
 NActionsLate=%s en retraso
@@ -847,9 +848,9 @@ ModuleBuilder=Módulo Builder
 SetMultiCurrencyCode=Establecer moneda
 BulkActions=Acciones masivas
 ClickToShowHelp=Haga clic para mostrar la ayuda sobre herramientas
-WebSite=Sitio web
+WebSite=Website
 WebSites=Sitios web
-WebSiteAccounts=Cuentas del sitio web
+WebSiteAccounts=Website accounts
 ExpenseReport=Gasto
 ExpenseReports=Informes de gastos
 HR=RRHH
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Confirmación de borrado de borradores en masa
 FileSharedViaALink=Archivo compartido a través de un enlace
 SelectAThirdPartyFirst=Selecciona un tercero primero...
 YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo %s "sandbox"
+Inventory=Inventario
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index f277782cecc..fd13746007a 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Objeto adjuntado
 NbOfActiveNotifications=Número de notificaciones (nº de destinatarios)
 PredefinedMailTest=__(Hello)__\nEste es un correo de prueba enviado a __EMAIL__.\nLas dos líneas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nEste es un correo de <b> prueba</b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí encontrará la factura __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNos gustaría advertirle que la factura __REF__ parece no ser pagada. Así que le enviamos de nuevo la factura en el archivo adjunto, como un recordatorio.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle el presupuesto __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Configuración del módulo website
 WEBSITE_PAGEURL=URL de la página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descripción
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Claves
 LinesToImport=Líneas a importar
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index e63f4a194c5..8f1c3724b96 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -20,6 +20,7 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL que ofrece una interfaz de pago en lí
 ToOfferALinkForOnlinePaymentOnContractLine=URL que ofrece una interfaz de pago en línea %s basada en el importe de una línea de contrato
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que ofrece una interfaz de pago en línea %s basada en un importe libre
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL que ofrece una interfaz de pago en línea %s basada en la cotización de un miembro
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=También puede añadir el parámetro url <b>&tag=<i>value</i></b>  para cualquiera de estas direcciones (obligatorio solamente para el pago libre) para ver su propio código de comentario de pago.
 SetupPayBoxToHavePaymentCreatedAutomatically=Configure su url PayBox <b>%s</b> para que el pago se cree automáticamente al validar.
 YourPaymentHasBeenRecorded=Esta página confirma que su pago se ha registrado correctamente. Gracias.
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index 309576cabe1..32d8e38ee7c 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -55,7 +55,7 @@ NoDraftProposals=Sin presupuestos borrador
 CopyPropalFrom=Crear presupuesto por copia de uno existente
 CreateEmptyPropal=Crear propuesta comercial vacía o desde lista de productos/servicios.
 DefaultProposalDurationValidity=Plazo de validez por defecto (en días)
-UseCustomerContactAsPropalRecipientIfExist=Utilizar dirección contacto de seguimiento de cliente definido en vez de la dirección del tercero como destinatario de los presupuestos
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clonar presupuesto
 ConfirmClonePropal=¿Está seguro de querer clonar el presupuesto <b>%s</b>?
 ConfirmReOpenProp=¿Está seguro de querer reabrir el presupuesto <b>%s</b>?
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 189da73243f..662b1297b8e 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -13,7 +13,7 @@ WEBSITE_CSS_INLINE=Contenido del archivo CSS (común a todas las páginas)
 WEBSITE_JS_INLINE=Contenido del archivo Javascript (común a todas las páginas)
 WEBSITE_HTML_HEADER=Adición en la parte inferior del encabezado HTML (común a todas las páginas)
 WEBSITE_ROBOT=Archivo de robots (robots.txt)
-WEBSITE_HTACCESS=Archivo .htaccess del sitio web
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=Encabezado HTML (específico de esta página solamente)
 PageNameAliasHelp=Nombre o alias de la página.<br>Este alias es utilizado también para construir una URL SEO cuando el website sea lanzado desde un Host Virtual de un servidor (como Apache, Nginx...). Usar el botón "<strong>%s</strong>" para editar este alias.
 EditTheWebSiteForACommonHeader=Nota: Si desea definir un encabezado personalizado para todas las páginas, edite el encabezado en el nivel del sitio en lugar de en la página/contenedor.
@@ -54,7 +54,7 @@ YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el bot
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Puede incluir código PHP en este fuente usando los tags <strong>&lt;?php ?&gt;</strong>. Dispone de estas variables globales: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> También puede incluir contenido de otra Página/Contenedor con la siguiente sintaxis:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> Para incluir un <strong>enlace para descargar</strong> un archivo guardado en el directorio <strong>documents</strong>, use el wrapper <strong>document.php</strong> :<br>Por ejemplo, para un archivo de documents/ecm (es necesario estar logueado), la sintaxis:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo de into documents/medias (directorio abierto para acceso público), la sintaxis es:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo compartido mediante un enlace compartido (acceso abierto utilizando la clave hash para compartir del archivo), la sintaxis es:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluir una <strong>imagen</strong> guardada en el directorio <strong>documents</strong> , use el wrapper <strong>viewimage.php</strong> :<br>Ejemplo para una imagen de documents/medias (acceso abierto), la sintaxis es:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clonar página/contenedor
 CloneSite=Clonar sitio
-SiteAdded=Sitio web agregado
+SiteAdded=Website added
 ConfirmClonePage=Por favor ingrese el código/alias de la nueva página y si es una traducción de la página clonada.
 PageIsANewTranslation=¿La nueva página es una traducción de la página actual?
 LanguageMustNotBeSameThanClonedPage=Usted clona una página como una traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
@@ -68,8 +68,8 @@ ImportSite=Importar plantilla de sitio web
 IDOfPage=Id de la página
 Banner=Banner
 BlogPost=Entrada en el blog
-WebsiteAccount=Cuenta del sitio web
-WebsiteAccounts=Cuentas del sitio web
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Crear cuenta de sitio web
 BackToListOfThirdParty=Volver a la lista de Terceros
 DisableSiteFirst=Deshabilite primero el sitio web
@@ -78,7 +78,7 @@ AnotherContainer=Otro contenedor
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar tabla de cuentas del sitio web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilitar tabla para almacenar cuentas del sitio web (inicio de sesión/contraseña) para cada sitio web/tercero
 YouMustDefineTheHomePage=Antes debe definir la página de inicio por defecto
-OnlyEditionOfSourceForGrabbedContentFuture=Atención: la creación de una página web mediante la importación de una página web externa está reservada para usuarios experimentados. Dependiendo de la complejidad de la página de origen, el resultado de la importación puede diferir una vez importado del original. Además, si la página de origen utiliza un estilo CSS común o un javascript no compatible, puede interrumpir el aspecto o las características del editor del sitio web al trabajar en esta página. Este método es una forma más rápida de tener una página, pero se recomienda crear su nueva página desde cero o desde una plantilla de página sugerida. También tenga en cuenta que solo será posible la edición de código HTML cuando el contenido de una página se haya inicializado al agarrar desde una página externa (el editor "en línea" NO estará disponible)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa
 GrabImagesInto=Obtener también imágenes encontradas en css y página.
 ImagesShouldBeSavedInto=Las imágenes deben guardarse en el directorio
@@ -89,7 +89,7 @@ CorporateHomePage=Página de inicio corporativa
 EmptyPage=Página vacía
 ExternalURLMustStartWithHttp=La URL externa debe comenzar con http:// o https://
 ZipOfWebsitePackageToImport=Archivo zip del paquete de sitio web
-ShowSubcontainers=Mostrar contenedores incluidos
+ShowSubcontainers=Include dynamic content
 InternalURLOfPage=URL interna de la página
 ThisPageIsTranslationOf=Esta página/contenedor es traducción de
 ThisPageHasTranslationPages=Esta página/contenedor tiene traducción
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index c1f71a8f52c..1361a6d3459 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Demoversioonis blokeeritud funktsionaalsus
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Alla laadimiseks leiad rohkem mooduleid Internetist.
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Otsi katsetuskärgus rakendusi/mooduleid
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multimoodulite tööriistad
 ModuleFamilyExperimental=Eksperimentaalsed moodulid
 ModuleFamilyFinancial=Finantsmoodulid (raamatupidamine/rahahaldus)
 ModuleFamilyECM=Dokumendihaldus (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menüüde töötlejad
 MenuAdmin=Menüü toimeti
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Kasutajad ja grupid
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Ettevõtete ja kontaktide haldamine (kliendid, huvilised)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Äritegevus
 Module2Desc=Äritegevuse seadistamine
 Module10Name=Raamatupidamine
@@ -501,7 +501,7 @@ Module23Desc=Energiatarbimise järelevalve
 Module25Name=Klientide tellimused
 Module25Desc=Klientide tellimuste haldamine
 Module30Name=Arved
-Module30Desc=Klientide müügi- ja kreeditarvete haldamine. Hankijate arvete haldamine.
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Hankijad
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Käibe- või müügimaksumäärad
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Maksetingimused
 DictionaryPaymentModes=Maksmine režiimid
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ökomaks (WEEE)
 DictionaryPaperFormat=Paberiformaadid
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Kohalike maksude aruanded on kohalike maksude müükide summas
 LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet
 LabelOnDocuments=Dokumentide silt
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Kuu lõpus
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Sündmuste turvaaudit
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Sirvija nimi
 BrowserOS=Sirvija operatsioonisüsteem
 ListOfSecurityEvents=Dolibarri turvasündmuste nimekiri
 SecurityEventsPurged=Turvasündmused tühjendatud
-LogEventDesc=Siin saab sisse lülitada Dolibarri turvalisusega seotud sündmuste logimise. Administraatorid saavad seejärel vajaliku info kätte menüüst <b>Süsteemi tööristad - Audit</b>. Hoiatus: see võib võtta andmebaasis palju ruumi.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
 SystemAreaForAdminOnly=Sellele alale saavad ligi ainult administraatorid. Ükski Dolibarri õigus ei saa seda piirangut eemaldada.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Toote neto ühikuhind
 TotalPriceAfterRounding=Koguhind (neto/km/km-ga) pärast ümardamist
 ParameterActiveForNextInputOnly=Parameeter kehtib vaid järgmise sisestuse ajal
-NoEventOrNoAuditSetup=Ühtki turvasündmust pole veel salvestatud. See on täiesti tavaline, kui auditeerimist pole veel "Seadistamine->Turvalisus->Audit" lehelt sisse lülitatud.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Vaata oma kohaliku sendmaili seadistust
 BackupDesc=Dolibarrist täieliku varukoopia tegemiseks pead:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Täiendavad atribuudid (thirdparty e kolmas isik)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Täiendavad atribuudid (member e liige)
 ExtraFieldsMemberType=Täiendavad atribuudid (member type e liikme liik)
 ExtraFieldsCustomerInvoices=Täiendavad atribuudid (arved)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Postiindeks
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 255d02951c3..7a49c2fa6ed 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -7,7 +7,7 @@ BankName=Panga nimi
 FinancialAccount=Konto
 BankAccount=Pangakonto
 BankAccounts=Pangakontod
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Finantskonto viide
 AccountLabel=Finantskonto silt
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Konto aadress
 BankAccountCountry=Konto riik
 BankAccountOwner=Konto omaniku nimi
 BankAccountOwnerAddress=Konto omaniku aadress
-RIBControlError=Väärtuste terviklikkuse kontroll luhtus. Sisestatud kontonumber on vigane või kehtetu (kontrolli üle riik, numbrid ja IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Loo uus konto
 NewBankAccount=Uus konto
 NewFinancialAccount=Uus finantskonto
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Saab viia vastavusse
 Conciliate=Vii vastavusse
 Conciliation=Vastavusse viimine
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Sh suletud tehingute summad
 OnlyOpenedAccount=Ainult avatud tehingud
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Pangaülekanne
 BankTransfers=Pangaülekanded
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Kust
 TransferTo=Kuhu
 TransferFromToDone=Kanne kontolt <b>%s</b> kontole <b>%s</b> väärtuses <b>%s</b> %s on registreeritud.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Pangatšekid
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Näita tšeki deponeerimise kviitungit
-NumberOfCheques=Tšekkide arv
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Tagasi konto juurde
 ShowAllAccounts=Näita kõigil kontodel
-FutureTransaction=Tehing toimub tulevikus, ajaline ühitamine pole võimalik.
-SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index eabdb32fb5a..58c42d84e56 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma arve
 InvoiceProFormaDesc=<b>Proforma arve</b> on õige arve kujuga, kuid ei oma raamatupidamislikku tähendust.
 InvoiceReplacement=Parandusarve
 InvoiceReplacementAsk=Parandusarve asendab arve
-InvoiceReplacementDesc=<b>Asendusarvet</b> kasutatakse tasumata arve tühistamiseks ja asendamiseks. <br><br> Tähelepanu: ainult tasumata arveid saab asendada.  Kui asendatav arve pole juba suletud, siis see suletakse automaatselt ja märgitakse tühistatuks.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Kreeditarve
 InvoiceAvoirAsk=Kreeditarve parandab arve
-InvoiceAvoirDesc=<b>Kreeditarve</b> on negatiivne arve, mida kasutatakse sellise probleemi lahendamiseks, kus arve summa ja reaalselt tasutud summa erinevad (kuna klient maksis ekslikult liiga palju või ei maksnud kõike ära, kuna ta tagastas mõned tooted).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Loo kreeditarve algse arve ridade põhjal
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Tagasi makstud
 DeletePayment=Kustuta makse
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Hankijate maksed
 ReceivedPayments=Laekunud maksed
 ReceivedCustomersPayments=Klientidelt laekunud maksed
-PayedSuppliersPayments=Hankijatele sooritatud maksed
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Klientidelt laekunud maksed, mida kinnitada
 PaymentsReportsForYear=Maksete aruanded %s jaoks
 PaymentsReports=Maksete aruanded
@@ -91,8 +91,8 @@ PaymentConditionsShort=Maksetingimused
 PaymentAmount=Makse summa
 ValidatePayment=Kinnita makse
 PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk
-HelpPaymentHigherThanReminderToPay=Tähelepanu, ühe või rohkema arve makse summa on kõrgem kui makstava summa jääk.<br>Muuda oma kannet või muul juhul kinnita see ja mõtle iga enammakstud arvega seotud kreeditarve loomisele.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Liigita 'Makstud'
 ClassifyPaidPartially=Liigita 'Osaliselt makstud'
 ClassifyCanceled=Liigita 'Hüljatud'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Suletud (maksmata)
 BillStatusClosedPaidPartially=Makstud (osaliselt)
 BillShortStatusDraft=Mustand
 BillShortStatusPaid=Makstud
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Makstud
 BillShortStatusCanceled=Hüljatud
 BillShortStatusValidated=Kinnitatud
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Suletud
 BillShortStatusClosedPaidPartially=Makstud (osaliselt)
 PaymentStatusToValidShort=Kinnitada
-ErrorVATIntraNotConfigured=Ühendusesisest KM numbrit pole veel määratletud
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Vaikimisi makseviisi pole määratletud. Mine mooduli Arved seadistusse selle parandamiseks.
 ErrorCreateBankAccount=Loo pangakonto ja seejärel mine Arved mooduli seadistuspaneeli makseviiside määratlemiseks.
 ErrorBillNotFound=Arvet %s ei ole
-ErrorInvoiceAlreadyReplaced=Viga: proovid kinnitada arvet arve %s asendamiseks, aga see on juba asendatud arvega %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Viga: allahindlust on juba kasutatud
 ErrorInvoiceAvoirMustBeNegative=Viga: õige arve peab olema negatiivse summaga
 ErrorInvoiceOfThisTypeMustBePositive=Viga: sellist tüüpi arve peab olema positiivse summaga
 ErrorCantCancelIfReplacementInvoiceNotValidated=Viga: ei saa tühistada arvet, mis on asendatud arvega, mis on veel mustandi staatuses
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Kellelt
 BillTo=Kellele
 ActionsOnBill=Tegevused arvel
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Halb klient
 ConfirmClassifyPaidPartiallyReasonProductReturned=Tooted osaliselt tagastatud
 ConfirmClassifyPaidPartiallyReasonOther=Summa hüljatud muul põhjusel
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=See valik on võimalik, kui arvele on lisatud sobiv kommentaar. (Näiteks: «Ainult tegelikult makstud hinnale vastav maks annab õiguse mahaarvamiseks»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Mõnedes riikides võib see valik võimalik olla vaid siis, kui arve sisaldab õiget märkust.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Kasuta seda valikut, kui ükski muu ei sobi
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Halb klient</b> on klient, kes keeldub oma võla maksmisest.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Seda valikut kasutatakse siis, kui tegu on mittetäieliku maksega, kuna osa kaupa tagastati
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Kasuta seda valikut, kui ükski muu ei sobi, näiteks järgmises olukorras:<br>- makse ei ole täielik, kuna osa kaupa saadeti tagasi<br>- summa on liiga tähtis, kuna unustati rakendada allahindlust<br>Kõikidel juhtudel tuleb enam makstud summa raamatupidamises korrigeerida kreeditarve abil.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Muu
 ConfirmClassifyAbandonReasonOtherDesc=Seda valikut kasutatakse kõigil muudel juhtudel. Näiteks siis, kui plaanid kasutada arve asendamist.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Kinnita arve
 UnvalidateBill=Muuda arve lahtiseks
-NumberOfBills=Arveid
-NumberOfBillsByMonth=Arveid kuus
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Arvete summa
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Arvete summa kuus (maksudeta)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Näita arvet
@@ -260,9 +262,9 @@ Repeatables=Mallid
 ChangeIntoRepeatableInvoice=Muuda arve malliks
 CreateRepeatableInvoice=Loo arve mall
 CreateFromRepeatableInvoice=Loo arve mallist
-CustomersInvoicesAndInvoiceLines=Müügiarved ja arvete read
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Müügiarved ja maksed
-ExportDataset_invoice_1=Müügiarvete nimekiri ja arvete read
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Müügiarved ja maksed
 ProformaBill=Proforma arve:
 Reduction=Vähendus
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Arve aadress
-HelpEscompte=Kliendile anti see soodustus, kuna ta maksis enne tähtaega.
-HelpAbandonBadCustomer=Sellest summast on loobutud (kuna tegu olevat halva kliendiga) ning on loetud erandlikuks kaotuseks.
-HelpAbandonOther=Sellest summast on loobutud, kuna tegu oli veaga (näiteks: vale klient või arve on asendatud teisega).
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Makse ID
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Ühtki arvet pole valitud
 CloneInvoice=Klooni arve
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Tegevus blokeeritud, kuna arve on asendatud
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Maksete arv
+DescTaxAndDividendsArea=Siin on näidatud kõikide kulude eest sooritatud maksete ülevaade. Näidatakse vaid kandeid, millega seotud makse on sooritatud määratud aastal.
+NbOfPayments=No. of payments
 SplitDiscount=Jaota allahindlus kaheks
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Sisesta kahe erineva osa summad:
-TotalOfTwoDiscountMustEqualsOriginal=Kahe uue allahindluse summa peab olema võrdne vana allahindluse summaga.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Seotud arve
 RelatedBills=Seotud arved
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Tšekk
 PaymentTypeShortCHQ=Tšekk
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On-line makse
-PaymentTypeShortVAD=On-line makse
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Mustand
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Pangarekvisiidid
 BankCode=Panga kood
-DeskCode=Laua kood
+DeskCode=Office code
 BankAccountNumber=Konto number
-BankAccountNumberKey=Võti
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Tasumine ülekandega järgmisele pangakontole
 VATIsNotUsedForInvoice=* Ei kohaldata käibemaksu art-293B CGI
 LawApplicationPart1=Seaduse 80.335 kuupäeval 12/05/80 kohaldamisega
 LawApplicationPart2=kaup jääb varaks
-LawApplicationPart3=müüja kuni täieliku tasumiseni
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=oma hind.
 LimitedLiabilityCompanyCapital=SARL kapitaliga
 UseLine=Rakenda
@@ -463,7 +465,7 @@ Cheques=Tšekid
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Kasuta arvete saatmiseks kliendi arveaadressi kolmanda isiku aadressi asemel
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Näita kõiki maksmata arved
 ShowUnpaidLateOnly=Näita ainult hilinenud maksmata arveid
 PaymentInvoiceRef=Tasumine arvel %s
@@ -474,21 +476,22 @@ Reported=Hilinenud
 DisabledBecausePayments=Pole võimalik, kuna on mõningaid makseid
 CantRemovePaymentWithOneInvoicePaid=Ei saa makset eemaldada, kuna vähemalt üks arve on märgitud makstuks
 ExpectedToPay=Oodatud makse
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Makstud selle maksega
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Liigita kõik täielikult tagasi makstud kreeditarved makstuks.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Kõik arved, mille kohta ei ole makstavat jääki, märgitakse makstuks.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Maksa
 ToMakePaymentBack=Maksa tagasi
 ListOfYourUnpaidInvoices=Maksmata arvete nimekiri
 NoteListOfYourUnpaidInvoices=Märkus: see nimekiri sisaldab vaid nende kolmandate isikute arveid, kelle jaoks Sa oled märgitud müügiesindajaks.
 RevenueStamp=Maksumärk
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=PDF mall Crabe arvete jaoks. Täielik arve mall (soovitatav mall).
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Tagastab numbri formaadiga %syymm-nnnn tavaliste arvete jaoks ja %syymm-nnnn kreeditarvete jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestusteta jada, mis ei lähe kunagi 0 tagasi.
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 4c6bb1acc1e..e0989ae0bd1 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Näita ettevõtet
 ShowStock=Näita ladu
 DeleteArticle=Klõpsa selle artikli eemaldamiseks
 FilterRefOrLabelOrBC=Otsi (viide/nimi)
-UserNeedPermissionToEditStockToUsePos=Hetkeseadistuste järgi vähendatakse laoseisu arve loomisel, seega peab kassa kasutajal olema õigus laoseisu muutmiseks.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Kassa
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang
index 9f2d984aae7..fc16424b5a1 100644
--- a/htdocs/langs/et_EE/commercial.lang
+++ b/htdocs/langs/et_EE/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonikõne
 ActionAC_FAX=Saada faks
 ActionAC_PROP=Saada pakkumine e-postiga
 ActionAC_EMAIL=Saada e-kiri
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Koosolekud
 ActionAC_INT=Sekkumine koha peal
 ActionAC_FAC=Saada kliendi arve posti teel
@@ -72,8 +73,8 @@ StatusProsp=Huviliste staatus
 DraftPropals=Mustandi staatuses olevad pakkumised
 NoLimit=Piirangut pole
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/et_EE/dict.lang b/htdocs/langs/et_EE/dict.lang
index e72204f69d8..ee56d2b3da7 100644
--- a/htdocs/langs/et_EE/dict.lang
+++ b/htdocs/langs/et_EE/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island ja McDonald
 CountryVA=Vatikan (Püha Tool)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Island
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indoneesia
 CountryIR=Iraan
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Põhja-Korea
 CountryKR=Lõuna-Korea
 CountryKW=Kuveit
-CountryKG=Kõrgõzstan
+CountryKG=Kyrgyzstan
 CountryLA=Laos
 CountryLV=Läti
 CountryLB=Liibanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongoolia
 CountryMS=Monserrat
 CountryMZ=Mosambiik
-CountryMM=Birma (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namiibia
 CountryNR=Nauru
 CountryNP=Nepaal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad ja Tobago
 CountryTR=Türgi
 CountryTM=Türkmenistan
-CountryTC=Turks ja Cailos saared
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritiuse ruupia
 CurrencySingMUR=Mauritiuse ruupia
 CurrencyNOK=Norra kroonid
-CurrencySingNOK=Norra kroon
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuneesia dinaarid
 CurrencySingTND=Tuneesia dinaar
 CurrencyUSD=USA dollarid
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Suusõnaline
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Töötaja
 DemandReasonTypeSRC_SPONSORING=Sponsorlus
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=4A0 formaat
 PaperFormatEU2A0=2A0 formaat
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index 4e3f49f469d..4e49c8f289b 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Dokumente kaustas
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Kaust
 ECMSectionManual=Kaust käsitsi
 ECMSectionAuto=Kaust automaatselt
@@ -34,6 +34,8 @@ ECMDocsByProjects=Projektidega seotud dokumendid
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Ühtki kausta pole loodud
 ShowECMSection=Näita kausta
 DeleteSection=Eemalda kaust
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index c1077f133cc..a1998490bce 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/help.lang b/htdocs/langs/et_EE/help.lang
index 4cb2f989aca..888a44b15e6 100644
--- a/htdocs/langs/et_EE/help.lang
+++ b/htdocs/langs/et_EE/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online reaalaja/kaudtoe tugi
 OtherSupport=Muu tugi
 ToSeeListOfAvailableRessources=Kontakteerumiseks/saadaval olevate ressursside nägemiseks:
 HelpCenter=Abiinfo
-DolibarrHelpCenter=Dolibarri abi ja tugikeskus
-ToGoBackToDolibarr=Muul juhul klõpsa Dolibarri kasutamiseks <a href="%s">siia</a>
-TypeOfSupport=Toe allikas
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Kogukond (tasuta)
 TypeSupportCommercial=Äriline
 TypeOfHelp=Liik
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Tõhusus
 TypeHelpOnly=Ainult abi
 TypeHelpDev=Abi+Arendus
-TypeHelpDevForm=Abi+Arendus+Rakendamine
-ToGetHelpGoOnSparkAngels1=Mõned ettevõtted pakuvad kiiret (vahepeal kohest) ja tõhusat online abi arvutit juhtides. Neid ettevõtteid leiab  <b>%s</b> veebilehelt:
-ToGetHelpGoOnSparkAngels3=Samuti võid kasutada kõigi saadavalolevate Dolibarri koolitajate nimekirja, selleks klõpsa nupule
-ToGetHelpGoOnSparkAngels2=Vahepeal ei ole otsingu tegemise hetkel ühtki ettevõtet saadaval, seega võid kasutada filtrit "kõik saadval", et rohkemate ettevõtete järele pärida.
-BackToHelpCenter=Muul juhul klõpsa <a href="%s">siia, et minna tagasi abiinfo kodulehele</a>.
-LinkToGoldMember=Võid helistada ühele Dolibarri poolt eelvalitud koolitajale Sinu keele (%s) jaoks tema vidinal klõpsates (staatust ja maksimaalset hinda uuendatakse automaatselt):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Toetatud keeled
-SubscribeToFoundation=Aita Dolibarri projekti, liitu sihtasutusega
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Ametlikuks Dolibarri toeks Sinu keeles: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index 3e92f4d40a1..f810d3a8825 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Personalihaldus
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Kuu aruanne
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Alguskuupäev
 DateFinCP=Lõppkuupäev
@@ -15,13 +15,18 @@ ApprovedCP=Heaks kiidetud
 CancelCP=Tühistatud
 RefuseCP=Keeldutud
 ValidatorCP=Heaks kiitja
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Kirjeldus
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Lõppkuupäev peab olema alguskuupäevast suurem.
 ErrorSQLCreateCP=Loomisel tekkis SQLi viga:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Informatsiooni töövoog
 RequestByCP=Taotles
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Muuda
 DeleteCP=Kustuta
 ActionRefuseCP=Keeldu
@@ -59,6 +71,7 @@ DateRefusCP=Keeldumise kuupäev
 DateCancelCP=Tühistamise kuupäev
 DefineEventUserCP=Määra kasutajale erakorraline puhkus
 addEventToUserCP=Määra puhkus
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Põhjus
 UserCP=Kasutaja
 ErrorAddEventToUserCP=Erakorralise puhkuse lisamisel tekkis viga
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Edukalt uuendatud.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index 7da4352d7df..f54e9f01eaf 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Palun järgige samm-sammult antavaid juhiseid.
 MiscellaneousChecks=Eelduste kontroll
 ConfFileExists=Seadistusfail <b>%s</b> on juba olemas.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Seadistusfaili <b>%s</b> pole olemas ning selle koostamine ebaõnnestus!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Seadistusfaili <b>%s</b> loomine on võimalik.
-ConfFileIsNotWritable=Seadistusfailil <b>%s</b> puudub kirjutamise õigus. Palun kontrolli õigusi. Esmapaigalduseks peab veebiserver saama sellesse faili seadistamise ajal kirjutada (näiteks &quot;chmod 666&quot; Unixi laadsetel operatsioonisüsteemidel).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Seadistusfail <b>%s</b> on kirjutatav.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Lae kogu informatsioon seadistusfailist uuesti.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Antud PHP toetab sessioone.
 PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET muutujaid.
-PHPSupportPOSTGETKo=On võimalik, et antud PHP seadistus ei toeta POST ja/või GET muutujaid. Kontrolli php.ini failis parameetri <b>variables_order</b> väärtust.
-PHPSupportGD=Antud PHP toetab GD graafilisi funktsioone.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Antud PHP toetab UTF8 funktsioone.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Antud PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b>. See peaks olema piisav.
-PHPMemoryTooLow=PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b> baiti, mis on tõenäoselt liiga madal. Muuda <b>php.ini</b> failis <b>memory_limit</b> parameetrit vähemalt <b>%s</b> baidi suuruseks.
-Recheck=Klõpsa siia põhjalikumaks testiks
-ErrorPHPDoesNotSupportSessions=Antud PHP paigaldus ei toeta sessioone. Dolibarri töötamiseks peavad sessioonid olema võimaldatud. Kontrolli oma PHP paigaldust.
-ErrorPHPDoesNotSupportGD=Antud PHP paigaldus ei toeta GD graafilisi funktsioone. Ühtki graafikut ei saa kasutada.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Antud PHP paigaldus ei toeta UTF8 funktsioone. Dolibarr ei saa korralikult töötada. Palun lahenda see probleem enne Dolibarri paigaldamist.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Kausta %s ei ole olemas.
-ErrorGoBackAndCorrectParameters=Mine tagasi ja parandada valed parameetrid.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Parameetri &quot;%s&quot; väärtus on ilmselt valesti sisestatud.
 ErrorFailedToCreateDatabase=Ei suutnud luua andmebaasi '%s &quot;.
 ErrorFailedToConnectToDatabase=Ei suutnud ühenduda andmebaasiga &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Andmebaasi versioon (%s) on liiga vana. Vaja on versiooni %s või kõrgemat.
 ErrorPHPVersionTooLow=PHP versioon on liiga vana. Vaja on versiooni %s.
-ErrorConnectedButDatabaseNotFound=Ühendus serveriga oli edukas, kuid andmebaasi &quot;%s&quot; ei leitud.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Andmebaas '%s &quot; on juba olemas.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Kui andmebaasi ei ole, mine tagasi ja märgista &quot;Loo andmebaas&quot;.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Kui andmebaas on juba olemas, mine tagasi ja võta märge &quot;Loo andmebaas&quot; maha.
-WarningBrowserTooOld=Liiga vana versiooni brauser. Brauseri uuendamine hiljutisele Firefoxi, Chromei või Opera versioonile on soovitav.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP versioon
 License=Kasutab litsentsi
 ConfigurationFile=Seadistusfail
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarri andmebaas
 DatabaseType=Andmebaasi tüüp
 DriverType=Draiveri tüüp
 Server=Server
-ServerAddressDescription=Andmebaasi serveri nimi või IP-aadress. Kui andmebaasiserver ja veebiserver on hostitud samas serveris, siis on see tavaliselt 'localhost'.
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Andmebaasi serveri port. Jäta tühjaks, kui see on teadmata.
 DatabaseServer=Andmebaasi server
 DatabaseName=Andmebaasi nimi
-DatabasePrefix=Andmebaasi tabeli prefiks
-AdminLogin=Dolibarri andmebaasi omaniku kasutajanimi.
-PasswordAgain=Korda parooli
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Dolibarri andmebaasi omaniku parool.
 CreateDatabase=Loo andmebaas
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Andmebaasi server - administraatori ligipääs
-CheckToCreateDatabase=Märgista ruut, kui andmebaasi ei ole veel olemas ja see tuleb luua. <br>Sellisel juhul tuleb antud lehe alumises osas täita andmebaasi administraatori kasutajanimi ja parool.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Kui andmebaasi või selle omanikku ei ole olemas, peab siia sisestama sellise kasutaja kasutajanime, kellel on lubatud luua uusi andmebaase või kasutajaid.
-KeepEmptyIfNoPassword=Jäta tühjaks, kui kasutajal pole parooli (väldi seda)
-SaveConfigurationFile=Salvesta väärtused
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Serveri ühendus
 DatabaseCreation=Andmebaasi loomine
 CreateDatabaseObjects=Andmebaasi objektide loomine
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Loo välisvõtmed ja indeksid tabelile %s
 OtherKeysCreation=Välisvõtmete ja indeksite loomine
 FunctionsCreation=Funktsioonide loomine
 AdminAccountCreation=Administraatori kasutaja loomine
-PleaseTypePassword=Palun sisesta parool, tühjad paroolid ei ole lubatud!
-PleaseTypeALogin=Palun sisesta kasutajanimi!
-PasswordsMismatch=Paroolid erinevad, palun proovi uuesti!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Paigaldamise lõpp
 SystemIsInstalled=Paigaldamine lõpetatud.
 SystemIsUpgraded=Dolibarr on edukalt uuendatud.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Dolibarri peab muutma oma vajadustele vastavaks (väli
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Mine Dolibarri
 GoToSetupArea=Mine Dolibarri (seadistusala)
-MigrationNotFinished=Andmebaasi versioon ei ole täielikult ajakohane, seega pead uuendusprotsessi uuesti käivitama.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Mine uuesti uuenduste lehele
 WithNoSlashAtTheEnd=Lõpus oleva kaldkriipsuta "/"
-DirectoryRecommendation=Soovitav on kasutada kausta, mis asub väljaspool veebilehtede säilitamise kausta.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=On juba olemas
 DolibarrAdminLogin=Dolibarri administraatori kasutajanimi
-AdminLoginAlreadyExists=Dolibarri administraatori konto '<b>%s</b>' on juba olemas. Mine tagasi eelmisele lehele lisakasutaja loomiseks.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Hoiatus: turvalisuse huvides tuleb pärast paigaldus- või uuendusprotsessi lõpetamist lisada Dolibarri dokumentide kausta fail nimega <b>install.lock</b>. See keelab paigaldusutiliitide kasutamise, et keegi ei saaks neid pahatahtlikel eesmärkidel kasutada.
-FunctionNotAvailableInThisPHP=Pole saadaval antud PHP paigaldusel
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Vali migratsiooni skript
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skripti töötlemine
 ChooseYourSetupMode=Vali paigalduse režiim ja klõpsa "Start" nupule...
 FreshInstall=Värske paigaldus
-FreshInstallDesc=Esmapaigalduse puhul kasuta seda režiimi. Muul juhul saab antud režiimi abil parandada lõpuni viimata paigaldust. Versiooni uuendamiseks vali "Uuenda" režiim.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Uuenda
 UpgradeDesc=Kasuta seda režiimi, kui tahad vanad Dolibarri failid asendada uuema versiooni failidega. See uuendab andmebaasi ja andmed.
 Start=Alusta
 InstallNotAllowed=<b>conf.php</b> failiga on paigaldus keelatud
 YouMustCreateWithPermission=Pead looma faili %s ning andma veebiserverile paigaldamisprotsessi ajaks kirjutamise õigused.
-CorrectProblemAndReloadPage=Palun lahenda probleem ja vajuta F5 lehe värskendamiseks.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Juba migreeritud
 DatabaseVersion=Andmebaasi versioo
 ServerVersion=Andmebaasiserveri versioon
 YouMustCreateItAndAllowServerToWrite=Pead looma selle kausta ning võimaldama veebiserveril sinna kirjutada.
 DBSortingCollation=Tähtede järgi sorteerimise järjekord
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Määrasid andmebaasi <b>%s</b> loomise, kuid selleks on Dolibarril vaja ühenduda serveriga <b>%s</b> juurkasutaja <b>%s</b> õigustes.
-YouAskLoginCreationSoDolibarrNeedToConnect=Määrasid andmebaasi kasutaja <b>%s</b> loomise, kuid selleks on Dolibarril vaja ühenduda serveriga <b>%s</b> juurkasutaja <b>%s</b> õigustes.
-BecauseConnectionFailedParametersMayBeWrong=Kuna ühenduse saamine ebaõnnestus, peavad hosti või juurkasutaja parameetrid valed olema.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Meetod %s avastas hüljatud makseid.
 RemoveItManuallyAndPressF5ToContinue=Eemaldada käsitsi ja vajuta jätkamiseks F5.
 FieldRenamed=Väli ümber nimetatud
-IfLoginDoesNotExistsCheckCreateUser=Kui antud kasutajat ei ole, siis pead märgistama kasti &quot;Loo kasutaja&quot;
-ErrorConnection=Server <b>&quot;%s&quot;</b>, andmebaasi nimi <b>&quot;%s&quot;</b>, kasutajanimi <b>&quot;%s&quot;</b> või andmebaasi parool võib olla vale või PHP kliendi versioon võib olla liiga vana andmebaasi versiooni suhtes.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Soovitatav valik on paigaldada versioon <b>%s</b> praeguse versiooni <b>%s</b> asemele
 InstallChoiceSuggested=<b>Installerija poolt soovitatav paigaldusvalik</b>
-MigrateIsDoneStepByStep=Sihitud versiooniga (%s) on praegusega mitmeversiooniline vahe, seega soovitab paigaldusabimees pärast praeguse migratsiooni lõppu järgmise migratsiooni.
-CheckThatDatabasenameIsCorrect=Kontrolli, et andmebaasi nimi <b>&quot;%s&quot;</b> on õige.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Kui nimi on õige ja andmebaasi pole veel loodud, siis pead märgistama kasti "Loo andmebaas".
 OpenBaseDir=PHP openbasedir parameeter
-YouAskToCreateDatabaseSoRootRequired=Märgistasid kasti &quot;Loo andmebaas&quot;. Selle jaoks pead sisestama juurkasutaja kasutajanime ja parooli (vormi alumises osas).
-YouAskToCreateDatabaseUserSoRootRequired=Märgistasid kasti &quot;Loo andmebaasi omanik&quot;. Selle jaoks pead sisestama juurkasutaja kasutajanime ja parooli (vormi alumises osas).
-NextStepMightLastALongTime=Praegune samm võib kesta mitu minutit. Palun oota enne jätkamist seni, kuni järgmine ekraan on täielikult laetud.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migreeri saadetiste andmesalv
 MigrationShippingDelivery=Uuenda saadetiste andmesalv
 MigrationShippingDelivery2=Uuenda saadetiste andmesalv 2
 MigrationFinished=Migreerimine lõpetatud
-LastStepDesc=<strong>Viimane samm:</strong> Määra siin tarkvaraga ühendumiseks kasutatav kasutajanimi ja parool. Hoia neid alles, kuna selle kontoga saab administreerida kõiki teisi kasutajaid.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktiveeri moodul %s
 ShowEditTechnicalParameters=Klõpsa siia lisaparameetrite näitamiseks/muutmiseks (spetsialisti režiim)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Sinu andmebaasi versioon on %s. Selles versioonis on tõsine puuk, mis põhjustab andmebaasi struktuuri muutmisel andmekadu, nagu seda teeb migratsiooni protsess. Seega ei ole migratsioon lubatud seni, kuni uuendad oma andmebaasi parandustega versioonile (teadaolevate vigaste versioonide nimekiri: %s)
-KeepDefaultValuesWamp=Kasutad DoliWampist pärit Dolibarri paigaldusabimeest, seega on siin pakutud väärtused juba optimeeritud. Muuda neid vaid siis, kui tead täpselt, mida teed.
-KeepDefaultValuesDeb=Kasutad Linuxi (Ubuntu, Debian, Fedora, ...) pakist pärit Dolibarri paigaldusabimeest, seega on siin pakutud väärtused juba optimeeritud. Pead sisestama vaid loodava andmebaasi omaniku parooli. Muuda teisi parameetreid vaid siis, kui tead täpselt, mida teed.
-KeepDefaultValuesMamp=Kasutad DoliMampist pärit Dolibarri paigaldusabimeest, seega on siin pakutud väärtused juba optimeeritud. Muuda neid vaid siis, kui tead täpselt, mida teed.
-KeepDefaultValuesProxmox=Kasutad Proxmoxi virtuaalrakendusest pärit Dolibarri paigaldusabimeest, seega on siin pakutud väärtused juba optimeeritud. Muuda neid vaid siis, kui tead täpselt, mida teed.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Pakkumiste andmete migreerimine
 MigrationInvoice=Müügiarvete andmete migreerimine
 MigrationContract=Lepingute andmete migreerimine
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Uuendamine edukalt lõpetatud
 MigrationUpdateFailed=Uuendamine ebaõnnestus
 MigrationRelationshipTables=Relatsioonide jaoks kasutatavate tabelite andmete migreerimine (%s)
 MigrationPaymentsUpdate=Makseandmete parandamine
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Lepingute andmete parandamine
 MigrationContractsNumberToUpdate=%s leping(ut) uuendada
 MigrationContractsLineCreation=Loo lepingu rida lepingule viitega %s
 MigrationContractsNothingToUpdate=Kõik tegevused lõpetatud
-MigrationContractsFieldDontExist=Välja fk_facture ei kasutata enam. Tegevused lõpetatud.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Lepingutel olevate tühjade kuupäevade korrigeerimine.
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Lepingutel pole tühje kuupäevi, mida parandada.
 MigrationContractsEmptyCreationDatesNothingToUpdate=Lepingute loomise kuupäevi pole vaja parandada
 MigrationContractsInvalidDatesUpdate=Vigaste kuupäevadega lepingute parandamine
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Saadetise uuendamine
 MigrationStockDetail=Uuenda toodete laoväärtusi
 MigrationMenusDetail=Uuenda dünaamiliste menüüde tabelid
 MigrationDeliveryAddress=Uuenda saadetiste kohaletoimetamise aadresse
-MigrationProjectTaskActors=Andmete migratsioon llx_projet_task_actors tabelile
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Andmete migratsiooni väli fk_user_resp tabelis llx_projet tabeliga llx_element_contact
 MigrationProjectTaskTime=Uuendamiseks kulutatud aeg sekundites
 MigrationActioncommElement=Uuenda tegevuste andmec
 MigrationPaymentMode=Maksete režiimi andmete migreerimine
 MigrationCategorieAssociation=Kategooriate migreerimine
-MigrationEvents=Sündmuste migreerimine sündmuse omaniku lisamiseks seoste tabelisse
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Näita mitte saadaval olevaid lisavalikuid
-HideNotAvailableOptions=Peida mitte saadaval olevad lisavalikud
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 2a065ff3b66..154c432e179 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Selle kolmanda isikuga seotud kontaktid
 ContactsAddressesForCompany=Selle kolmanda isikuga seotud kontaktid/aadressid
 AddressesForCompany=Selle kolmanda isikuga seotud aadressid
 ActionsOnCompany=Selle kolmanda isikuga seotud tegevused
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Selle liikmega seotud tegevused
 ActionsOnProduct=Events about this product
 NActionsLate=%s hiljaks jäänud
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 9156ba9f899..71ac2bca2a0 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Seostatud objekt
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Tiitel
 WEBSITE_DESCRIPTION=Kirjeldus
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/et_EE/paybox.lang b/htdocs/langs/et_EE/paybox.lang
index b77a0f2267e..721018fe62a 100644
--- a/htdocs/langs/et_EE/paybox.lang
+++ b/htdocs/langs/et_EE/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox mooduli seadistamine
 PayBoxDesc=See moodul võimaldab klientidel makseid sooritada <a href="http://www.paybox.com" target="_blank">Payboxi</a> lehel. Seda võib kasutada tavalise maksena või maksena teatud Dolibarri objektidel (arved, tellimused jne)
 FollowingUrlAreAvailableToMakePayments=Dolibarri objektide põhjal maksete sooritamiseks on klientidele pakkuda järgnevate lehtede URLid:
 PaymentForm=Maksmise vorm
-WelcomeOnPaymentPage=Tere tulemast meie online makseteenusesse
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=See ekraan võimaldab teil teha online-makseid üksusele %s.
 ThisIsInformationOnPayment=See on makse sooritamise info
 ToComplete=Lõpuni viia
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=Müügiarve eest maksmiseks kasutatava %s
 ToOfferALinkForOnlinePaymentOnContractLine=Lepingu rea eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnFreeAmount=Vaba rea eest maksmiseks kasutatava %s online makseteenuse URL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Liikmemaksu eest maksmiseks kasutatava %s online makseteenuse URL
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Samuti võid lisa URL parameetri <b>&tag=<i>value</i></b> igale nendest URLidest (nõutud vaid vaba makse jaoks) oma loodud makse kommentaari sildi jaoks.
-SetupPayBoxToHavePaymentCreatedAutomatically=Seadista oma PayBox URLiga <b>%s</b> makse automaatseks loomiseks, kui PayBox on selle kinnitanud.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=See lehekülg kinnitab, et makse on registreeritud. Täname!
-YourPaymentHasNotBeenRecorded=Makset ei ole registreeritud ja tehing on tühistatud. Täname!
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Konto parameetrid
 UsageParameter=Kasutamise parameetrid
 InformationToFindParameters=Abi %s konto info leidmiseks
diff --git a/htdocs/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang
index 5d8cb34b3e9..6917dcf28ca 100644
--- a/htdocs/langs/et_EE/propal.lang
+++ b/htdocs/langs/et_EE/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Allkirjastatud (vaja arve esitada)
 PropalStatusNotSigned=Allkirjastamata (suletud)
 PropalStatusBilled=Arve esitatud
 PropalStatusDraftShort=Mustand
-PropalStatusValidatedShort=Kinnitatud
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Suletud
 PropalStatusSignedShort=Allkirjastatud
 PropalStatusNotSignedShort=Allkirjastamata
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Pakkumist %s ei leitud
 AddToDraftProposals=Lisa pakkumise mustandisse
 NoDraftProposals=Pakkumise mustandeid ei ole
 CopyPropalFrom=Loo pakkumine olemasoleva pakkumise kopeerimise teel
-CreateEmptyPropal=Loo tühje pakkumisi, mis on puhtad või toodete/teenuste nimekirja põhjal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Pakkumise kehtivus vaikimisi (päevades)
-UseCustomerContactAsPropalRecipientIfExist=Kasuta pakkumise saaja aadressina kolmanda isiku aadressi asemel kontaktaadressi, kui see on määratletud
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klooni pakkumine
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kliendi kontakt pakkumise järelkaja jaoks
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Pakkumise täielik mudel (logo jne)
+DocModelCyanDescription=Pakkumise täielik mudel (logo jne)
 DefaultModelPropalCreate=Vaikimisi mudeli loomine
 DefaultModelPropalToBill=Vaikimisi mall pakkumise sulgemiseks (arve esitada)
 DefaultModelPropalClosed=Vaikimisi mall pakkumise sulgemiseks (arvet ei esitata)
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 6e11d8873be..742f58bede9 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kood
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Loe
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index ca1686c9df7..c08a199c770 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Demo-an ezgaitutako aukera
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Modulu-anitzen tresnak
 ModuleFamilyExperimental=Modulu esperimentalak
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu maneiatzailea
 MenuAdmin=Menu editorea
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Komertziala
 Module2Desc=Kudeaketa komertziala
 Module10Name=Kontabilitatea
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Bezeroen Eskaerak
 Module25Desc=Bezeroen eskaerak kudeatzea
 Module30Name=Fakturak
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Hornitzaileak
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index df45008a7c2..536cd97472a 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 56180c5d0f9..8490071a747 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Ordainketa ezabatu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Hornitzaileei ordainketak
 ReceivedPayments=Jasotako ordainketak
 ReceivedCustomersPayments=Bezeroen jasotako ordainketak
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Balidatu beharreko bezeroen jasotako ordainketak
 PaymentsReportsForYear=%s ordainketen txostena
 PaymentsReports=Ordainketen txostena
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Ordainketaren zenbatekoa
 ValidatePayment=Ordainketak balioztatu
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bezero txarra
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Besteak
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Faktura balioztatu
 UnvalidateBill=Faktura baliogabeta
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Faktura kopurua
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Faktura erakutsi
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index 2c1117431d2..e2cd012998e 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index 694e5f8f987..b906dc8f734 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Proiektuaren egoera
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/eu_ES/dict.lang b/htdocs/langs/eu_ES/dict.lang
index fc5f4cb803c..b57cc3a7ea1 100644
--- a/htdocs/langs/eu_ES/dict.lang
+++ b/htdocs/langs/eu_ES/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrania
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US dolarrak
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Langilea
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/eu_ES/ecm.lang
+++ b/htdocs/langs/eu_ES/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/help.lang b/htdocs/langs/eu_ES/help.lang
index 7ac144a89b2..3a719cd8324 100644
--- a/htdocs/langs/eu_ES/help.lang
+++ b/htdocs/langs/eu_ES/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Komertziala
 TypeOfHelp=Mota
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index c373d3154d2..6ba427aa3b6 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Deskribapena
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Editatu
 DeleteCP=Ezabatu
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=Erabiltzailea
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 967a801a0f9..7a3e3190a38 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 2d45c813ffb..1401e5f2d96 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Deskribapena
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/eu_ES/paybox.lang b/htdocs/langs/eu_ES/paybox.lang
index 74409da05ce..531838580ac 100644
--- a/htdocs/langs/eu_ES/paybox.lang
+++ b/htdocs/langs/eu_ES/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/eu_ES/propal.lang b/htdocs/langs/eu_ES/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/eu_ES/propal.lang
+++ b/htdocs/langs/eu_ES/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index bd74a3bdf89..a343af8c7d9 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kodea
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index dc20b67d3e6..f69f459b813 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=از ویژگی های غیر فعال در نسخه ی ن
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=تنها عناصر از <a href="%s">ماژول های فعال</a> نمایش داده می شود.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=چند ماژول ابزار
 ModuleFamilyExperimental=ماژول های تجربی
 ModuleFamilyFinancial=ماژول های مالی (حسابداری / خزانه داری)
 ModuleFamilyECM=مدیریت محتوا الکترونیکی (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=گرداننده منو
 MenuAdmin=ویرایشگر منو
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=کاربران و گروهها
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=شرکت ها و مدیریت تماس (مشتریان، چشم انداز ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=تجاری
 Module2Desc=مدیریت بازرگانی
 Module10Name=حسابداری
@@ -501,7 +501,7 @@ Module23Desc=نظارت بر مصرف انرژی
 Module25Name=سفارشات مشتری
 Module25Desc=مدیریت سفارش مشتری
 Module30Name=صورت حساب
-Module30Desc=فاکتور و مدیریت توجه داشته باشید اعتباری برای مشتریان. مدیریت فاکتور برای تامین کنندگان
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=تولید کنندگان
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=نرخ مالیات بر ارزش افزوده و یا فروش ن
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=شرایط پرداخت
 DictionaryPaymentModes=حالت های پرداخت
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=فرمت مقاله
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=گزارش مالیات های محلی هستند که مجم
 LabelUsedByDefault=برچسب استفاده می شود به طور پیش فرض اگر هیچ ترجمه ای برای کد یافت
 LabelOnDocuments=برچسب در اسناد
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=در پایان ماه
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=رویدادهای ممیزی امنیت
-Audit=ممیزی
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=نام مرورگر
 BrowserOS=مرورگر OS
 ListOfSecurityEvents=فهرست حوادث امنیتی Dolibarr
 SecurityEventsPurged=رویدادهای امنیتی پاکسازی
-LogEventDesc=شما می توانید در اینجا قادر به ورود به سیستم برای رویدادهای امنیتی Dolibarr. <b>حسابرسی -</b> مدیران پس از آن می توانید مطالب خود را از طریق <b>ابزارهای سیستم</b> منو را ببینید. اخطار، این ویژگی می تواند مقدار زیادی از داده ها در پایگاه داده مصرف می کند.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=اطلاعات سیستم اطلاعات فنی موارد دیگر شما در حالت فقط خواندنی و قابل مشاهده فقط برای مدیران دریافت می باشد.
 SystemAreaForAdminOnly=این منطقه در دسترس است فقط برای کاربران مدیر سیستم باشد. هیچ یک از مجوز Dolibarr می تواند از این حد کاهش دهد.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=قیمت واحد خالص محصول
 TotalPriceAfterRounding=قیمت کل (خالص مالیاتی / مالیات بر ارزش افزوده / نرم) پس از گرد کردن
 ParameterActiveForNextInputOnly=پارامتر برای ورودی بعدی موثر تنها
-NoEventOrNoAuditSetup=هیچ رویداد امنیتی ثبت نشده است. این می تواند طبیعی اگر ممیزی شده است در "راه اندازی - امنیتی - حسابرسی" فعال نیست صفحه.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=مشاهده راه اندازی از sendmail محلی خود
 BackupDesc=برای ایجاد یک پشتیبان کامل از Dolibarr، شما باید:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=ویژگی های مکمل (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=ویژگی های مکمل (عضو)
 ExtraFieldsMemberType=ویژگی های مکمل (نوع عضو)
 ExtraFieldsCustomerInvoices=ویژگی های مکمل (فاکتورها)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=زیپ
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 8db4ed8c266..18b90e887a3 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -7,7 +7,7 @@ BankName=نام بانک
 FinancialAccount=حساب
 BankAccount=حساب بانکی
 BankAccounts=حسابهای بانکی
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=نيازمندی های حساب مالی شخص
 AccountLabel=برچسب حساب مالی
@@ -46,7 +46,7 @@ BankAccountDomiciliation=آدرس حساب
 BankAccountCountry=کشور حساب
 BankAccountOwner=نام صاحب حساب
 BankAccountOwnerAddress=حساب آدرس صاحب
-RIBControlError=کنترل یکپارچگی از ارزش مواجه شد. این به این معنی اطلاعات برای این شماره حساب است کامل و یا اشتباه نیست (چک کشور، اعداد و IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=ایجاد حساب کاربری
 NewBankAccount=حساب کاربری جدید
 NewFinancialAccount=الحساب المالي الجديد
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=می توان آشتی
 Conciliate=وفق دادن
 Conciliation=مصالحه
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=شامل حساب های بسته شده
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=انتقال بانک
 BankTransfers=نقل و انتقالات بانکی
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=از
 TransferTo=به
 TransferFromToDone=ونقل من هناك إلى ٪ <b>٪ ق ق ق ٪</b> ٪ وقد سجلت ق.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=چک های بانکی
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=نمایش چک دریافت سپرده
-NumberOfCheques=Nb در چک
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=برگشت به حساب
 ShowAllAccounts=نمایش برای همه حساب ها
-FutureTransaction=معامله در futur. هیچ راهی برای مصالحه.
-SelectChequeTransactionAndGenerate=انتخاب چک / فیلتر به چک دریافت سپرده شامل و کلیک بر روی "ایجاد".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=در نهایت، تعیین یک دسته بندی است که در آن برای طبقه بندی پرونده
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 11e30d192d4..c8a92d600c1 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=فاکتورمقدماتی
 InvoiceProFormaDesc=<b>فاکتور را</b> یک تصویر از یک فاکتور درست است اما هیچ ارزش حسابداری.
 InvoiceReplacement=فاکتور تعویض
 InvoiceReplacementAsk=فاکتور جایگزین برای فاکتور
-InvoiceReplacementDesc=<b>فاکتور جایگزین</b> استفاده شده است به لغو و جایگزین به طور کامل صورت حساب بدون پرداخت در حال حاضر دریافت. <br><br> نکته: فقط فاکتورها بدون پرداخت بر روی آن را می توان جایگزین کرد. اگر صورت حساب را عوض کنید هنوز بسته نشده است، آن را به طور خودکار به "رها" بسته است.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=توجه داشته باشید اعتباری
 InvoiceAvoirAsk=توجه داشته باشید اعتباری برای اصلاح صورت حساب
-InvoiceAvoirDesc=<b>توجه داشته باشید اعتباری</b> فاکتور منفی استفاده می شود برای حل این واقعیت است که فاکتور دارای مقدار است که از مقدار واقعا پرداخت می شود، متفاوت است (به دلیل مشتری های خطا بیش از حد پرداخت می شود، و یا به طور کامل پرداخت می شود چرا که او بازگشت برخی از محصولات به عنوان مثال) است.
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=ایجاد اعتبار توجه با خطوط از فاکتور مبدا
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=پرداخت به عقب
 DeletePayment=حذف پرداخت
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=تولید کنندگان پرداخت
 ReceivedPayments=دریافت پرداخت
 ReceivedCustomersPayments=پرداخت دریافت از مشتریان
-PayedSuppliersPayments=پرداخت غیر انتفایی به تامین کنندگان
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=مشتریان دریافت پرداخت ها به اعتبار
 PaymentsReportsForYear=گزارش پرداخت برای٪ s
 PaymentsReports=گزارش پرداخت
@@ -91,8 +91,8 @@ PaymentConditionsShort=شرایط پرداخت
 PaymentAmount=مقدار پرداخت
 ValidatePayment=اعتبار پرداخت
 PaymentHigherThanReminderToPay=پرداخت بالاتر از یادآوری به پرداخت
-HelpPaymentHigherThanReminderToPay=توجه، مقدار پرداخت یک یا چند صورت حساب بالاتر از بقیه به پرداخت است. <br> ویرایش ورود خود را، در غیر این صورت تایید و فکر می کنم در مورد ایجاد توجه داشته باشید اعتباری بیش از حد دریافت شده در هر فاکتورها پرداخت.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=طبقه بندی 'پرداخت'
 ClassifyPaidPartially=طبقه بندی 'پرداخت تا حدی'
 ClassifyCanceled=طبقه بندی 'رها'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=بسته (بدون حقوق)
 BillStatusClosedPaidPartially=پرداخت (تا حدی)
 BillShortStatusDraft=پیش نویس
 BillShortStatusPaid=پرداخت
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=پرداخت
 BillShortStatusCanceled=متروک
 BillShortStatusValidated=اعتبار
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=بسته
 BillShortStatusClosedPaidPartially=پرداخت (تا حدی)
 PaymentStatusToValidShort=به اعتبار
-ErrorVATIntraNotConfigured=تعداد مالیات بر ارزش افزوده Intracommunautary هنوز تعریف نشده
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=بدون حالت پرداخت به طور پیش فرض تعریف شده است. برو به نصب ماژول فاکتور به رفع این.
 ErrorCreateBankAccount=ایجاد یک حساب بانکی، سپس به پنل راه اندازی ماژول فاکتور به تعریف حالت های پرداخت
 ErrorBillNotFound=فاکتور٪ s وجود ندارد
-ErrorInvoiceAlreadyReplaced=خطا، شما سعی می کنید به اعتبار صورتحساب به جای صورتحساب٪ است. اما این یکی در حال حاضر توسط فاکتور٪ s را جایگزین کرد.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=خطا، تخفیف ویژه در حال حاضر استفاده می شود
 ErrorInvoiceAvoirMustBeNegative=خطا، فاکتور صحیح باید یک مقدار منفی داشته
 ErrorInvoiceOfThisTypeMustBePositive=خطا، این نوع از فاکتور باید یک مقدار مثبت
 ErrorCantCancelIfReplacementInvoiceNotValidated=خطا، می تواند یک فاکتور است که توسط فاکتور دیگری است که هنوز هم در وضعیت پیش نویس جایگزین لغو کنید
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=از
 BillTo=به
 ActionsOnBill=عملیات در فاکتور
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=مشتری بد
 ConfirmClassifyPaidPartiallyReasonProductReturned=محصولات نیمه بازگشت
 ConfirmClassifyPaidPartiallyReasonOther=میزان دلیل دیگر رها
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=این انتخاب ممکن است اگر صورت حساب خود را با نظر مناسب ارائه شده است. (به عنوان مثال «تنها مالیات مربوط به قیمت است که در واقع پرداخت شده است را می دهد حقوق به کسر»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=در برخی از کشورها، این انتخاب ممکن است تنها اگر صورت حساب خود شامل توجه داشته باشید درست است.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=با استفاده از این انتخاب اگر تمام دیگر مناسب نیست
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>مشتری بد</b> یک مشتری که به پرداخت بدهی خود امتناع است.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=این گزینه استفاده می شود که پرداخت کامل نیست چرا که برخی از محصولات بازگردانده شدند
-ConfirmClassifyPaidPartiallyReasonOtherDesc=با استفاده از این انتخاب اگر تمام دیگر مناسب نیست، به عنوان مثال در شرایط زیر است: <br> - پرداخت کامل نیست چرا که برخی از محصولات پشت حمل می شد <br> - مقدار بیش از حد مهم است ادعا کرد به دلیل تخفیف به فراموشی سپرده شد <br> در همه موارد، مقدار بیش از حد ادعا باید در سیستم حسابداری با ایجاد یک یادداشت اعتباری را اصلاح کرد.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=دیگر
 ConfirmClassifyAbandonReasonOtherDesc=این انتخاب خواهد شد در تمام موارد دیگر استفاده می شود. به عنوان مثال دلیل این که شما برنامه ریزی برای ایجاد یک فاکتور جایگزین.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=اعتبار فاکتور
 UnvalidateBill=فاکتور Unvalidate
-NumberOfBills=Nb و از فاکتورها
-NumberOfBillsByMonth=Nb و از فاکتورها در ماه
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=مقدار فاکتورها
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=مقدار فاکتورها توسط ماه (خالص از مالیات)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=نمایش فاکتور
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=صورت حساب مشتری و خطوط صورت حساب را
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=صورت حساب مشتری و پرداخت
-ExportDataset_invoice_1=فهرست فاکتورها مشتری و خطوط صورت حساب را
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=صورت حساب مشتری و پرداخت
 ProformaBill=PROFORMA بیل:
 Reduction=کاهش
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=آدرس بیل
-HelpEscompte=این تخفیف تخفیف اعطا شده به مشتری است، زیرا پرداخت آن قبل از واژه ساخته شده است.
-HelpAbandonBadCustomer=این مقدار متوقف شده (مشتری گفته می شود یک مشتری بد) است و به عنوان یک شل استثنایی در نظر گرفته.
-HelpAbandonOther=این مقدار متوقف شده از آن خطا بود (مشتری اشتباه و یا فاکتور های دیگر به عنوان مثال به جای)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=شناسه پرداخت
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=بدون فاکتور انتخاب شده
 CloneInvoice=فاکتور کلون
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=اقدام غیر فعال به دلیل فاکتور جایگزین شده است
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb و پرداخت
+DescTaxAndDividendsArea=این منطقه خلاصه ای از تمام پرداخت های ساخته شده برای مصارف خاص است. تنها پرونده با پرداخت در طول سال ثابت هستند در اینجا گنجانده شده است.
+NbOfPayments=No. of payments
 SplitDiscount=تخفیف تقسیم در دو
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=مقدار ورودی برای هر یک از دو بخش است:
-TotalOfTwoDiscountMustEqualsOriginal=مجموع دو تخفیف های جدید باید به مقدار تخفیف اصلی برابر باشد.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=فاکتور های مرتبط
 RelatedBills=فاکتورها مرتبط
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=بررسی
 PaymentTypeShortCHQ=بررسی
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=در پرداخت خط
-PaymentTypeShortVAD=در پرداخت خط
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=پیش نویس
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=اطلاعات بانکی
 BankCode=کد بانک
-DeskCode=کد میز
+DeskCode=Office code
 BankAccountNumber=شماره حساب
-BankAccountNumberKey=کلید
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=شماره IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / تعداد SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=پرداخت از طریق انتقال در
 VATIsNotUsedForInvoice=* مالیات بر ارزش افزوده غیر قابل اجرا هنر 293B از CGI
 LawApplicationPart1=با استفاده از قانون 80.335 از 12/05/80
 LawApplicationPart2=کالا باقی می ماند دارایی
-LawApplicationPart3=فروشنده تا تجاری کامل
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=قیمت خود را.
 LimitedLiabilityCompanyCapital=SARL با سرمایه از
 UseLine=درخواست
@@ -463,7 +465,7 @@ Cheques=چک
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=استفاده از حسابداری و مدیریت مشتری آدرس تماس به جای آدرس شخص ثالث به عنوان دریافت کننده برای صورت حساب
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=نمایش همه فاکتورها پرداخت نشده
 ShowUnpaidLateOnly=نمایش فاکتورها اواخر سال پرداخت نشده و تنها
 PaymentInvoiceRef=پرداخت صورتحساب از٪ s
@@ -474,21 +476,22 @@ Reported=به تاخیر افتاده
 DisabledBecausePayments=ممکن نیست زیرا بعضی از پرداخت وجود دارد
 CantRemovePaymentWithOneInvoicePaid=آیا می توانم پرداخت را حذف کنید از حداقل یک فاکتور طبقه بندی شده پرداخت می شود وجود دارد
 ExpectedToPay=پرداخت مورد انتظار
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=پرداخت شده توسط این پرداخت
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=طبقه بندی "پرداخت" تمام یادداشت های اعتباری به طور کامل دوباره پرداخت می شود.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=همه فاکتور بدون باقی می ماند به پرداخت به طور خودکار به وضعیت "پرداخت" بسته است.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=پرداخت
 ToMakePaymentBack=پرداخت
 ListOfYourUnpaidInvoices=فهرست فاکتورها پرداخت نشده
 NoteListOfYourUnpaidInvoices=توجه: این لیست فقط شامل صورت حساب برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است.
 RevenueStamp=تمبر درآمد
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=فاکتور PDF قالب Crabe. قالب فاکتور کامل (قالب توصیه می شود)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=تعداد بازگشت با فرمت٪ syymm-NNNN برای فاکتورها استاندارد و٪ syymm-NNNN برای یادداشت های اعتباری که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index 7f3c5e3d4fd..67936820791 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=نمایش شرکت
 ShowStock=نمایش انبار
 DeleteArticle=برای حذف این مقاله کلیک کنید
 FilterRefOrLabelOrBC=جستجو (کد عکس / برچسب)
-UserNeedPermissionToEditStockToUsePos=از شما خواسته شده تا موجودی انبار را هنگام ایجاد فاکتور کاهش دهید، بنابراین کاربری که از POS استفاده می کند می بایست اجازه ویرایش انبار را داشته باشد.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=نقطه ای از فروش
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
index 5f357b8e982..5b3c0791bdb 100644
--- a/htdocs/langs/fa_IR/commercial.lang
+++ b/htdocs/langs/fa_IR/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=تلفن تماس
 ActionAC_FAX=ارسال فکس
 ActionAC_PROP=ارسال پیشنهاد از طریق پست
 ActionAC_EMAIL=ارسال ایمیل
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=جلسات
 ActionAC_INT=مداخله در سایت
 ActionAC_FAC=ارسال صورت حساب به مشتری از طریق پست
@@ -72,8 +73,8 @@ StatusProsp=وضعیت چشم انداز
 DraftPropals=طرح تجاری پیش نویس
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/fa_IR/dict.lang b/htdocs/langs/fa_IR/dict.lang
index be678a6bd65..585a88e51e6 100644
--- a/htdocs/langs/fa_IR/dict.lang
+++ b/htdocs/langs/fa_IR/dict.lang
@@ -116,7 +116,7 @@ CountryHM=جزیره هرد و مک دونالد
 CountryVA=مقدس (شهر واتیکان)
 CountryHN=هندوراس
 CountryHK=هنگ کنگ
-CountryIS=ایسلند
+CountryIS=Iceland
 CountryIN=هندوستان
 CountryID=اندونزی
 CountryIR=ایران
@@ -131,7 +131,7 @@ CountryKI=کیریباتی
 CountryKP=کره شمالی
 CountryKR=کره جنوبی
 CountryKW=کویت
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=لائوس
 CountryLV=لتونی
 CountryLB=لبنان
@@ -160,7 +160,7 @@ CountryMD=مولدووا
 CountryMN=مغولستان
 CountryMS=Monserrat از
 CountryMZ=موزامبیک
-CountryMM=Birmania (میانمار)
+CountryMM=Myanmar (Burma)
 CountryNA=نامیبیا
 CountryNR=نائورو
 CountryNP=نپال
@@ -223,7 +223,7 @@ CountryTO=تونگا
 CountryTT=ترینیداد و توباگو
 CountryTR=بوقلمون
 CountryTM=ترکمنستان
-CountryTC=جزایر ترک و Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=تووالو
 CountryUG=اوگاندا
 CountryUA=اوکراین است
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=روپیه موریس
 CurrencySingMUR=روپیه موریس
 CurrencyNOK=krones نروژی
-CurrencySingNOK=کرون نروژی
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=دینار تونس
 CurrencySingTND=دینار تونس
 CurrencyUSD=دلار آمریکا
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=دهان به دهان
 DemandReasonTypeSRC_PARTNER=شریک
 DemandReasonTypeSRC_EMPLOYEE=کارمند
 DemandReasonTypeSRC_SPONSORING=ضمانت
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=نوع 4A0
 PaperFormatEU2A0=نوع 2A0
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index 9cb9e2cf546..72c710e913f 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb و اسناد در دایرکتوری
+ECMNbOfDocs=No. of documents in directory
 ECMSection=دایرکتوری
 ECMSectionManual=دایرکتوری دستی
 ECMSectionAuto=دایرکتوری ها به صورت خودکار
@@ -34,6 +34,8 @@ ECMDocsByProjects=اسناد مربوط به پروژه
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=بدون دایرکتوری ایجاد شده
 ShowECMSection=نمایش دایرکتوری
 DeleteSection=حذف دایرکتوری
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index a17be7c6b37..e7d07cafaea 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/help.lang b/htdocs/langs/fa_IR/help.lang
index 21f7a537bc1..73fa11ad0b1 100644
--- a/htdocs/langs/fa_IR/help.lang
+++ b/htdocs/langs/fa_IR/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=زمان واقعی آنلاین / پشتیبانی از ر
 OtherSupport=پشتیبانی دیگر
 ToSeeListOfAvailableRessources=برای تماس / نگاه کنید به منابع در دسترس:
 HelpCenter=مرکز راهنما
-DolibarrHelpCenter=کمک Dolibarr و پشتیبانی مرکز
-ToGoBackToDolibarr=در غیر این صورت، با کلیک <a href="%s">در اینجا به استفاده از Dolibarr</a>
-TypeOfSupport=منبع پشتیبانی
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=ارتباطات (رایگان)
 TypeSupportCommercial=تجاری
 TypeOfHelp=نوع
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=بهره وری
 TypeHelpOnly=راهنما تنها
 TypeHelpDev=راهنما + توسعه
-TypeHelpDevForm=سازند راهنما + توسعه +
-ToGetHelpGoOnSparkAngels1=برخی از شرکت ها می توانند پشتیبانی آنلاین سریع (گاهی اوقات فوری) و کارآمد تر با در نظر گرفتن کنترل کامپیوتر شما را فراهم کنند. این کمک کننده ها را می توان <b>در٪ بازدید کنندگان</b> وب سایت یافت:
-ToGetHelpGoOnSparkAngels3=شما همچنین می توانید به لیستی از تمام مربیان برای Dolibarr بروید، برای این کار با کلیک بر روی دکمه
-ToGetHelpGoOnSparkAngels2=گاهی اوقات، هیچ شرکت های موجود در حال حاضر شما می توانید جستجوی خود را وجود دارد، بنابراین فکر می کنم برای تغییر فیلتر برای "همه در دسترس بودن" است. شما قادر به ارسال درخواست بیشتر خواهد شد.
-BackToHelpCenter=در غیر این صورت، در اینجا کلیک کنید برای رفتن <a href="%s">به عقب برای کمک به صفحه اصلی مرکز</a> .
-LinkToGoldMember=شما می توانید یکی از مربی های Dolibarr برای زبان خود را (از٪ s) با کلیک کردن ویجت خود (وضعیت و حداکثر قیمت ها به طور خودکار به روز رسانی) از پیش انتخاب شده تماس بگیرید:
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=زبانهای پشتیبانی شده
-SubscribeToFoundation=کمک به پروژه Dolibarr، مشترک به پایه و اساس
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=برای حمایت Dolibarr رسمی در زبان شما: <br> <a href="%s" target="_blank"><b>از٪ s</b></a>
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index cdf39db949a..d25e68be23d 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=بیانیه ماهانه
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=تاریخ شروع
 DateFinCP=تاریخ پایان
@@ -15,13 +15,18 @@ ApprovedCP=تایید شده
 CancelCP=لغو شد
 RefuseCP=رد
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=توصیف
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=شما باید تاریخ پایان بیشتر از تاریخ شروع انتخاب کنید.
 ErrorSQLCreateCP=خطای SQL در ایجاد رخ داده است:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=گردش کار اطلاعات
 RequestByCP=درخواست شده توسط
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=ویرایش
 DeleteCP=حذف کردن
 ActionRefuseCP=رد کردن
@@ -59,6 +71,7 @@ DateRefusCP=تاریخ امتناع
 DateCancelCP=عضویت لغو
 DefineEventUserCP=اختصاص مرخصی استثنایی برای کاربر
 addEventToUserCP=اختصاص مرخصی
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=دلیل
 UserCP=کاربر
 ErrorAddEventToUserCP=در حالی که با اضافه کردن مرخصی استثنایی خطایی رخ داد.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=به روز رسانی با موفقیت.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 6e21b063868..f12cf21f309 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=لطفا دستورالعمل‌ها را گام به گام اجرا کنید. 
 MiscellaneousChecks=بررسی پیش‌نیازها 
 ConfFileExists=فایل پیکربندی <b>%s</b> موجود است
-ConfFileDoesNotExistsAndCouldNotBeCreated=فایل <b>پیکربندی٪ s</b> وجود ندارد و نمی توان آن را!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=فایل <b>پیکربندی٪ s را</b> می تواند ایجاد شود.
-ConfFileIsNotWritable=فایل <b>پیکربندی٪ است</b> قابل نوشتن نیست. مجوز بررسی کنید. برای اولین بار نصب کنید، وب سرور شما باید اعطا می شود که قادر به ارسال این فایل در فرایند پیکربندی (به عنوان مثال در یونیکس مانند سیستم عامل "سطح دسترسی 666").
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=فایل <b>پیکربندی٪ s</b> قابل نوشتن است.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=بازنگری تمام اطلاعات از فایل پیکربندی.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=این جلسات PHP پشتیبانی می کند.
 PHPSupportPOSTGETOk=این PHP پشتیبانی از متغیر های POST و GET.
-PHPSupportPOSTGETKo=این امکان وجود دارد راه اندازی PHP شما از متغیر های POST پشتیبانی نمی کند و / یا. بررسی کنید <b>variables_order</b> پارامتر خود را در php.ini.
-PHPSupportGD=این GD پشتیبانی از PHP توابع گرافیکی.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=این پشتیبانی از PHP توابع UTF8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=PHP حداکثر شما حافظه جلسه <b>به٪ s</b> تنظیم شده است. این باید به اندازه کافی باشد.
-PHPMemoryTooLow=PHP حداکثر شما حافظه را وارد نمایید <b>به٪ s</b> بایت تنظیم شده است. این باید بسیار کم باشد. تغییر <b>فایل php.ini</b> خود را به تنظیم پارامتر <b>memory_limit را</b> به <b>حداقل٪ s</b> بایت.
-Recheck=برای تست نشانگر بیشتر اینجا را کلیک کنید
-ErrorPHPDoesNotSupportSessions=نصب و راه اندازی PHP شما جلسات را پشتیبانی نمی کند. این ویژگی مورد نیاز است تا Dolibarr کار. راه اندازی PHP خود را چک کنید.
-ErrorPHPDoesNotSupportGD=نصب و راه اندازی PHP شما از عملکرد گرافیکی GD پشتیبانی نمی کند. بدون نمودار در دسترس خواهد بود.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=نصب و راه اندازی PHP شما توابع UTF8 را پشتیبانی نمی کند. Dolibarr نمی تواند به درستی کار می کنند. حل این قبل از نصب Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=شاخه٪ s وجود ندارد.
-ErrorGoBackAndCorrectParameters=برو به عقب و اصلاح پارامترهای اشتباه است.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=شما ممکن است یک مقدار اشتباه برای پارامتر '٪ s' را تایپ.
 ErrorFailedToCreateDatabase=برای ایجاد پایگاه داده '٪ s »شکست خورد.
 ErrorFailedToConnectToDatabase=برای اتصال به پایگاه داده '٪ s »شکست خورد.
 ErrorDatabaseVersionTooLow=نسخه پایگاه داده (٪ بازدید کنندگان) خیلی قدیمی است. نسخه٪ s یا بالاتر مورد نیاز است.
 ErrorPHPVersionTooLow=نسخه PHP خیلی قدیمی است. نسخه٪ s مورد نیاز است.
-ErrorConnectedButDatabaseNotFound=اتصال به موفق سرور، اما پایگاه داده '٪ s' یافت نشد.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=پایگاه داده '٪ s' از قبل وجود دارد.
-IfDatabaseNotExistsGoBackAndUncheckCreate=اگر پایگاه داده وجود دارد، به عقب برگردید و گزینه تیک بزنید "ایجاد پایگاه داده".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=اگر پایگاه داده در حال حاضر وجود دارد، بازگشت و تیک گزینه "ایجاد پایگاه داده" گزینه است.
-WarningBrowserTooOld=نسخه خیلی قدیمی از مرورگر. به روز رسانی مرورگر خود را به آخرین ورژن فایرفاکس، کروم و اپرا است که به شدت توصیه.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP نسخه
 License=با استفاده از مجوز
 ConfigurationFile=فایل پیکربندی
@@ -45,22 +45,23 @@ DolibarrDatabase=پایگاه داده Dolibarr
 DatabaseType=نوع پایگاه داده
 DriverType=نوع درایور
 Server=سرور
-ServerAddressDescription=نام یا آدرس آی پی برای سرور پایگاه داده، معمولا "localhost را 'زمانی که سرور پایگاه داده است در همان سرور از وب سرور میزبانی
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=پایگاه داده پورت سرور. خالی اگر ناشناخته نگه دارید.
 DatabaseServer=بانک اطلاعات سرور
 DatabaseName=نام پایگاه داده
-DatabasePrefix=پایگاه داده جدول پیشوند
-AdminLogin=ورود برای صاحب پایگاه داده Dolibarr.
-PasswordAgain=تکرار گذرواژه بار دوم
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=رمز عبور برای صاحب پایگاه داده Dolibarr.
 CreateDatabase=ایجاد پایگاه داده
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=بانک اطلاعات سرور - دسترسی به کاربران بالاتر را میدهد
-CheckToCreateDatabase=جعبه چک کنید اگر پایگاه داده وجود ندارد و باید ایجاد شود. <br> در این مورد، شما باید وارد شوید / رمز عبور برای نام کاربر مدیر در پایین این صفحه را پر کنید.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=ورود از کاربر مجاز به ایجاد پایگاه داده جدید و یا کاربران جدید، اجباری اگر بانک اطلاعاتی شما و یا صاحب آن می کند در حال حاضر وجود ندارد.
-KeepEmptyIfNoPassword=دیدگاهتان را خالی اگر کاربر هیچ رمز عبور (جلوگیری از این)
-SaveConfigurationFile=صرفه جویی در مقدار
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=اتصال به سرور
 DatabaseCreation=ایجاد پایگاه داده
 CreateDatabaseObjects=اشیاء پایگاه داده ایجاد
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=ایجاد کلید های خارجی و شاخص برا
 OtherKeysCreation=کلید های خارجی و شاخص ایجاد
 FunctionsCreation=ایجاد توابع
 AdminAccountCreation=ایجاد ورود مدیر
-PleaseTypePassword=لطفا رمز عبور را تایپ کنید، کلمه عبور خالی امکان پذیر نیست!
-PleaseTypeALogin=لطفا وارد شوید و تایپ کنید!
-PasswordsMismatch=کلمات عبور متفاوت، لطفا دوباره سعی کنید!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=پایان از راه اندازی
 SystemIsInstalled=این نصب کامل شده است.
 SystemIsUpgraded=Dolibarr با موفقیت به روز رسانی شده است.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=شما نیاز به پیکربندی Dolibarr را ب
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=برو به Dolibarr
 GoToSetupArea=برو به Dolibarr (منطقه راه اندازی)
-MigrationNotFinished=نسخه از پایگاه داده خود را به طور کامل به روز نیست، بنابراین شما باید برای اجرای عملیات ارتقا دوباره.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=برو به ارتقاء دوباره صفحه
 WithNoSlashAtTheEnd=بدون اسلش "/" در انتهای
-DirectoryRecommendation=این است توصیه به استفاده از یک دایرکتوری در خارج از دایرکتوری خود را از صفحات وب خود را.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=در حال حاضر وجود دارد
 DolibarrAdminLogin=Dolibarr مدیر در انجمن
-AdminLoginAlreadyExists=حساب مدیر Dolibarr <b>'٪ s' از</b> قبل وجود دارد. برو به عقب، اگر شما می خواهید برای ایجاد یک دیگر.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=اخطار، به دلایل امنیتی، پس از نصب و یا ارتقا کامل است، برای جلوگیری از استفاده از ابزار را دوباره نصب کنید، شما باید یک فایل <b>install.lock</b> به دایرکتوری سند Dolibarr نام اضافه، به منظور جلوگیری از سوء استفاده از آن را.
-FunctionNotAvailableInThisPHP=در این پی اچ پی در دسترس نیست
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=را انتخاب کنید اسکریپت مهاجرت
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=پردازش اسکریپت
 ChooseYourSetupMode=حالت راه اندازی خود را انتخاب کنید و دکمه "شروع" ...
 FreshInstall=تازه نصب
-FreshInstallDesc=با استفاده از این حالت اگر اولین بار از این شما نصب می شود. اگر نه، این حالت می تواند تعمیر نصب قبلی ناقص، اما اگر شما می خواهید برای ارتقاء نسخه خود را، را انتخاب کنید "به روز رسانی" حالت.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=به روز رسانی
 UpgradeDesc=با استفاده از این حالت اگر شما فایل های قدیمی Dolibarr با فایل ها از یک نسخه جدیدتر جایگزین شده است. این پایگاه داده ها و اطلاعات خود را ارتقا دهید.
 Start=شروع
 InstallNotAllowed=راه اندازی شده توسط مجوز <b>conf.php</b> مجاز نیست
 YouMustCreateWithPermission=شما باید فایل٪ s و مجوز نوشتن در آن را برای وب سرور ایجاد در طول فرایند نصب کنید.
-CorrectProblemAndReloadPage=لطفا مشکل را رفع و F5 را فشار دهید به بارگذاری مجدد صفحه.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=در حال حاضر مهاجرت
 DatabaseVersion=بانک اطلاعات نسخه
 ServerVersion=نسخه سرور پایگاه داده
 YouMustCreateItAndAllowServerToWrite=شما باید این پوشه ایجاد کنید و اجازه می دهد برای وب سرور برای ارسال به آن.
 DBSortingCollation=شخصیت منظور مرتب سازی
-YouAskDatabaseCreationSoDolibarrNeedToConnect=از شما درخواست برای ایجاد پایگاه <b>داده٪ است،</b> اما برای این، Dolibarr نیاز به اتصال <b>به٪ s</b> سرور با مجوز فوق العاده <b>کاربر٪ s را.</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=از شما درخواست برای ایجاد پایگاه داده ورود <b>به٪ s را،</b> اما برای این، Dolibarr نیاز به اتصال <b>به٪ s</b> سرور با مجوز فوق العاده <b>کاربر٪ s را.</b>
-BecauseConnectionFailedParametersMayBeWrong=به عنوان اتصال، میزبان یا پارامترهای کاربر فوق العاده باید اشتباه باشد.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=یتیمان پرداخت شناسایی شده با استفاده از روش از٪ s
 RemoveItManuallyAndPressF5ToContinue=حذف آن دستی و F5 را فشار دهید تا ادامه خواهد داد.
 FieldRenamed=درست است تغییر نام داد
-IfLoginDoesNotExistsCheckCreateUser=اگر وارد کند وجود دارد نشده است، شما باید گزینه را تیک "ایجاد کاربر"
-ErrorConnection=سرور <b>"٪ s"،</b> نام پایگاه داده <b>"٪ s"،</b> برای ورود اینجا <b>"٪ s"،</b> و یا رمز عبور پایگاه داده ممکن است اشتباه باشد و یا نسخه PHP مشتری ممکن است خیلی قدیمی در مقایسه با نسخه پایگاه داده باشد.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=توصیه می شود انتخاب به نصب <b>نسخه٪ s از</b> نسخه فعلی خود را <b>از٪ s</b>
 InstallChoiceSuggested=<b>نصب انتخاب پیشنهاد شده توسط نصب.</b>
-MigrateIsDoneStepByStep=نسخه هدف قرار دادند (٪ بازدید کنندگان) دارای یک شکاف از چندین نسخه، پس از نصب ویزارد باز خواهد گشت تا نشان می دهد مهاجرت بعدی یک بار این یکی تمام می شود.
-CheckThatDatabasenameIsCorrect=بررسی کنید که نام پایگاه داده <b>"٪ s"</b> درست است.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=اگر این نام درست است و پایگاه داده هنوز وجود ندارد، شما باید گزینه "ایجاد پایگاه داده" تیک بزنید.
 OpenBaseDir=پارامتر PHP openbasedir
-YouAskToCreateDatabaseSoRootRequired=شما چک باکس "ایجاد پایگاه داده". برای این کار، شما نیاز به ارائه ورود / رمز عبور کاربر مدیر (پایین فرم).
-YouAskToCreateDatabaseUserSoRootRequired=شما چک باکس "ایجاد صاحب پایگاه داده". برای این کار، شما نیاز به ارائه ورود / رمز عبور کاربر مدیر (پایین فرم).
-NextStepMightLastALongTime=مرحله کنونی ممکن است چند دقیقه طول بکشد. لطفا صبر کنید تا صفحه بعدی به طور کامل قبل از ادامه نشان داده شده است.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=مهاجرت حمل و نقل برای سفارشات مشتری ذخیره سازی
 MigrationShippingDelivery=به روز رسانی ذخیره سازی حمل و نقل
 MigrationShippingDelivery2=به روز رسانی ذخیره سازی حمل و نقل 2
 MigrationFinished=مهاجرت به پایان رسید
-LastStepDesc=<strong>آخرین مرحله:</strong> تعریف اینجا کاربری و رمز عبور شما قصد استفاده برای اتصال به نرم افزار. آیا این شل نیست آن را به عنوان حساب به اداره همه دیگران است.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=فعال بخش٪ s
 ShowEditTechnicalParameters=برای نشان دادن پارامترهای پیشرفته / ویرایش اینجا را کلیک کنید (حالت کارشناسی)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=شما با استفاده از جادوگر در راه اندازی Dolibarr از DoliWamp، بنابراین مقادیر ارائه شده در اینجا در حال حاضر بهینه شده است. تغییر آنها را تنها در صورتی شما می دانید آنچه شما انجام دهد.
-KeepDefaultValuesDeb=شما با استفاده از جادوگر Dolibarr راه اندازی از یک بسته لینوکس (اوبونتو، دبیان، فدورا ...)، بنابراین مقادیر ارائه شده در اینجا در حال حاضر بهینه شده است. تنها رمز صاحب پایگاه داده برای ایجاد باید پر شوند. تغییر پارامترهای دیگر تنها در صورتی شما می دانید آنچه شما انجام دهد.
-KeepDefaultValuesMamp=شما با استفاده از جادوگر در راه اندازی Dolibarr از DoliMamp، بنابراین مقادیر ارائه شده در اینجا در حال حاضر بهینه شده است. تغییر آنها را تنها در صورتی شما می دانید آنچه شما انجام دهد.
-KeepDefaultValuesProxmox=شما با استفاده از جادوگر در راه اندازی Dolibarr از یک دستگاه مجازی بورس، بنابراین مقادیر ارائه شده در اینجا در حال حاضر بهینه شده است. تغییر آنها را تنها در صورتی شما می دانید آنچه شما انجام دهد.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=مهاجرت داده ها برای طرح های تجاری
 MigrationInvoice=اطلاعات مهاجرت برای صورت حساب مشتری
 MigrationContract=اطلاعات مهاجرت برای قرارداد
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=به روز رسانی موفق
 MigrationUpdateFailed=روند ارتقاء شکست خورده
 MigrationRelationshipTables=مهاجرت به داده ها برای جداول رابطه (٪ بازدید کنندگان)
 MigrationPaymentsUpdate=پرداخت اصلاح داده ها
@@ -163,9 +164,9 @@ MigrationContractsUpdate=قرارداد اصلاح داده ها
 MigrationContractsNumberToUpdate=٪ s در قرارداد (ها) برای به روز رسانی
 MigrationContractsLineCreation=ایجاد خط قرارداد برای قرارداد کد عکس از٪ s
 MigrationContractsNothingToUpdate=هیچ چیز بیشتری برای انجام
-MigrationContractsFieldDontExist=fk_facture درست می کند وجود دارد نیست. هیچ چیز به انجام.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=قرارداد تصحیح تاریخ خالی
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=بدون قرارداد تاریخ خالی برای اصلاح
 MigrationContractsEmptyCreationDatesNothingToUpdate=تاریخ ایجاد قرارداد برای اصلاح
 MigrationContractsInvalidDatesUpdate=تاریخ مقدار بد اصلاح قرارداد
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=به روز رسانی تحویل
 MigrationStockDetail=به روز رسانی ارزش سهام از محصولات
 MigrationMenusDetail=به روز رسانی جداول منوهای پویا
 MigrationDeliveryAddress=آدرس تحویل به روز رسانی در محموله
-MigrationProjectTaskActors=اطلاعات مهاجرت برای llx_projet_task_actors جدول
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=اطلاعات مهاجرت درست است fk_user_resp از llx_projet به llx_element_contact
 MigrationProjectTaskTime=زمان به روز رسانی صرف در ثانیه
 MigrationActioncommElement=به روز کردن اطلاعات در مورد اقدامات
 MigrationPaymentMode=اطلاعات مهاجرت برای حالت پرداخت
 MigrationCategorieAssociation=مهاجرت از دسته
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=نمایش گزینه های در دسترس نیست
-HideNotAvailableOptions=پنهان کردن گزینه های در دسترس نیست
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 83a9c5bae79..8c0f619faa4 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=اطلاعات تماس این شخص ثالث
 ContactsAddressesForCompany=تماس / آدرس برای این شخص ثالث
 AddressesForCompany=آدرس برای این شخص ثالث
 ActionsOnCompany=رویدادها در مورد این شخص ثالث
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=رویدادها در مورد این عضو
 ActionsOnProduct=Events about this product
 NActionsLate=٪ s در اواخر
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 80a7d1df104..66dbb8f8061 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -83,6 +83,7 @@ LinkedObject=شی مرتبط
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=عنوان
 WEBSITE_DESCRIPTION=توصیف
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/fa_IR/paybox.lang b/htdocs/langs/fa_IR/paybox.lang
index a7a99980a7f..2357f0c102e 100644
--- a/htdocs/langs/fa_IR/paybox.lang
+++ b/htdocs/langs/fa_IR/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=راه اندازی ماژول خزانه
 PayBoxDesc=این ماژول صفحات پیشنهاد به اجازه پرداخت در <a href="http://www.paybox.com" target="_blank">خزانه</a> شده توسط مشتریان. این می تواند برای پرداخت رایگان و پرداخت در یک شیء خاص Dolibarr استفاده می شود (فاکتور، سفارش، ...)
 FollowingUrlAreAvailableToMakePayments=از آدرس های زیر در دسترس است به ارائه یک صفحه به مشتریان به پرداخت در اشیاء Dolibarr است
 PaymentForm=فرم پرداخت
-WelcomeOnPaymentPage=در سرویس پرداخت آنلاین ما خوش آمدید
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=این صفحه نمایش به شما اجازه ایجاد پرداخت آنلاین به٪ s.
 ThisIsInformationOnPayment=این اطلاعات در پرداخت به انجام است
 ToComplete=برای تکمیل
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL برای ارائه٪ رابط کار
 ToOfferALinkForOnlinePaymentOnContractLine=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای قرارداد خط
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای مقدار رایگان
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای به اشتراک عضو
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=شما همچنین می توانید پارامتر URL <b>و برچسب = <i>مقدار</i></b> را به هر یک از این URL (فقط برای پرداخت رایگان مورد نیاز) برای اضافه کردن خود برچسب توضیحات پرداخت خود اضافه کنید.
-SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با <b>آدرس٪ s را</b> به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=این صفحه تایید می کند که پرداخت شما ثبت شده است. متشکرم.
-YourPaymentHasNotBeenRecorded=شما پرداخت ثبت شده است نیست و معامله لغو شده است. متشکرم.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=پارامترهای حساب
 UsageParameter=پارامترهای طریقه استفاده
 InformationToFindParameters=کمک برای پیدا کردن٪ شما اطلاعات حساب
diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
index fce5360e22c..f597d370923 100644
--- a/htdocs/langs/fa_IR/propal.lang
+++ b/htdocs/langs/fa_IR/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=امضا (نیازهای حسابداری و مدیریت)
 PropalStatusNotSigned=امضا نشده (بسته شده)
 PropalStatusBilled=ثبت شده در صورتحساب یا لیست
 PropalStatusDraftShort=پیش نویس
-PropalStatusValidatedShort=اعتبار
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=بسته
 PropalStatusSignedShort=امضاء شده
 PropalStatusNotSignedShort=امضا نشده
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal٪ s را یافت نشد
 AddToDraftProposals=اضافه کردن به پیش نویس پیشنهاد
 NoDraftProposals=بدون پیش نویس پیشنهادات
 CopyPropalFrom=ایجاد طرح های تجاری با کپی کردن طرح های موجود
-CreateEmptyPropal=ایجاد خالی طرح تجاری vierge و یا از لیست محصولات / خدمات
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=پیش فرض طول مدت اعتبار پیشنهاد های تجاری (در روز)
-UseCustomerContactAsPropalRecipientIfExist=اگر به جای آدرس شخص ثالث به عنوان آدرس دریافت کننده پیشنهاد تعریف شده استفاده از آدرس ارتباط با مشتری
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=پیشنهاد تجاری کلون
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=تماس با مشتری را در پی ب
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=یک مدل پیشنهاد کامل (logo. ..)
+DocModelCyanDescription=یک مدل پیشنهاد کامل (logo. ..)
 DefaultModelPropalCreate=ایجاد مدل پیش فرض
 DefaultModelPropalToBill=قالب پیش فرض هنگام بستن یک طرح کسب و کار (به صورتحساب می شود)
 DefaultModelPropalClosed=قالب پیش فرض هنگام بستن یک طرح کسب و کار (unbilled)
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 5115f976cbd..c8f34712da7 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=رمز
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=خواندن
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index c3043105bed..dffbf08c96e 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Ominaisuus on poistettu käytöstä demossa
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Löydä ulkoisia app/moduuleja
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules työkalut
 ModuleFamilyExperimental=Kokeellinen modules
 ModuleFamilyFinancial=Talouden Moduulit (Kirjanpito / Rahoitus)
 ModuleFamilyECM=Sisällönhallinta (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Valikko käsitteleville
 MenuAdmin=Valikko editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Klikkaa näyttääksesi kuvaus
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Käyttäjät & ryhmät
 Module0Desc=Käyttäjien / Työntekijöiden ja ryhmien hallinta
 Module1Name=Third Parties
-Module1Desc=Yrityksien ja yhteystietojen hallinnointi (asiakkaat, prospektit...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Kaupalliset
 Module2Desc=Kaupallinen hallinnointi
 Module10Name=Kirjanpito
@@ -501,7 +501,7 @@ Module23Desc=Seuranta kulutus energialähteiden
 Module25Name=Asiakastilaukset
 Module25Desc=Asiakastilausten hallinnointi
 Module30Name=Laskut
-Module30Desc=Laskut ja hyvityslaskut hallinto-asiakkaille. Laskut hallinto-toimittajille
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Tavarantoimittajat
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logit
@@ -902,7 +902,7 @@ DictionaryVAT=Alv
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Maksuehdot
 DictionaryPaymentModes=Maksutavat
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ympäristöveron (WEEE)
 DictionaryPaperFormat=Paper tiedostomuodot
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löytyy koodi
 LabelOnDocuments=Label asiakirjoihin
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Kuukauden lopussa
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security Audit tapahtumat
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Tietoja Dolibarrista
 InfoBrowser=Tietoja selaimesta
 InfoOS=Tietoja OS
@@ -1065,7 +1066,7 @@ BrowserName=Selaimen nimi
 BrowserOS=Selaimen OS
 ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
 SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava
-LogEventDesc=Voit ottaa loki Dolibarr turvallisuus tapahtumia täältä. Järjestelmänvalvojat voivat sitten nähdä sen sisällön kautta valikosta <b>System tools - Audit.</b> Varoitus, tämä ominaisuus voi kuluttaa suuren määrän tietoa tietokannasta.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
 SystemAreaForAdminOnly=Tämä alue on käytettävissä järjestelmänvalvojan käyttäjät vain. Ei mikään Dolibarr käyttöoikeudet voidaan vähentää tätä rajaa.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net yksikköhinta tuotteen
 TotalPriceAfterRounding=Kokonaishinta (netto / vat / sis. alv) pyöristämisen jälkeen
 ParameterActiveForNextInputOnly=Parametri tehokas Seuraavan vain tuloa
-NoEventOrNoAuditSetup=O turvallisuus tapahtuma on kirjattu vielä. Tämä voi olla normaali, jos tarkastusta ei ole käytössä "setup - turvallisuus - audit"-sivulla.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Katso paikallisen sendmail setup
 BackupDesc=Voit tehdä täydellinen varmuuskopio Dolibarr sinun tulee:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Postinumero
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index c26e2203480..29fddbc2f71 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -7,7 +7,7 @@ BankName=Pankin nimi
 FinancialAccount=Tili
 BankAccount=Pankkitili
 BankAccounts=Pankkitilit
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Näytä tili
 AccountRef=Rahoitustase viite
 AccountLabel=Rahoitustase etiketti
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Tilin osoite
 BankAccountCountry=Tilin maa
 BankAccountOwner=Tilinomistajan nimi
 BankAccountOwnerAddress=Tilinomistajan osoite
-RIBControlError=Eheydentarkistus arvojen epäonnistuu. Tämä tarkoittaa tiedoista tilinumero eivät ole täydellisiä tai väärin (tarkista maassa, numerot ja IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Luo tili
 NewBankAccount=Uusi tili
 NewFinancialAccount=New rahoitustili
@@ -76,6 +76,7 @@ TransactionsToConciliate=Täsmäytettävät tapahtumat
 Conciliable=Conciliable
 Conciliate=Sovita
 Conciliation=Yhteensovita
+SaveStatementOnly=Save statement only
 ReconciliationLate=Täsmäytys myöhässä
 IncludeClosedAccount=Sisällytä suljettu tilit
 OnlyOpenedAccount=Vain avoimet tilit
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal veron maksu
 BankTransfer=Pankkisiirto
 BankTransfers=Pankkisiirrot
 MenuBankInternalTransfer=Sisäinen siirto
-TransferDesc=Siirto tililtä toiselle. Dolibarr luo molemmille tileille kirjaukset (debet lähdetilille ja kredit vastaanottavalle tilille) samalla summalla (ainoastaan etumerkki muuttuu). Päivämäärää ja nimikettä käytetään myös tässä tapahtumassa.
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Mistä
 TransferTo=mihin
 TransferFromToDone=A <b>siirtää %s %s %s%</b> s on tallennettu.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Haluatko varmasti poistaa tämän sekkikuitin?
 BankChecks=Pankkisekit
 BankChecksToReceipt=Talletusta odottavat shekit
 ShowCheckReceipt=Näytä tarkistaa Talletus kuitti
-NumberOfCheques=Nb Sekkien
+NumberOfCheques=No. of check
 DeleteTransaction=Poista merkintä
 ConfirmDeleteTransaction=Haluatko varmasti poistaa tämän merkinnän?
 ThisWillAlsoDeleteBankRecord=Tämä poistaa myös luodun pankkimerkinnän
@@ -135,8 +136,8 @@ BankTransactionLine=Pankkimerkintä
 AllAccounts=All bank and cash accounts
 BackToAccount=Takaisin tiliin
 ShowAllAccounts=Näytä kaikki tilit
-FutureTransaction=Tapahtuma on tulevaisuudessa. Ei soviteltavissa.
-SelectChequeTransactionAndGenerate=Valitse / suodattaa tarkastuksiin sisällyttää osaksi tarkastus talletuksen vastaanottamisesta ja klikkaa &quot;Luo&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Valitse tämän täsmäytyksen tiliote. Käytä lajiteltavaa numeroarvoa: YYYYMM tai YYYYMMDD
 EventualyAddCategory=Määritä luokka johon tiedot luokitellaan
 ToConciliate=Täsmäytä?
@@ -153,7 +154,7 @@ RejectCheckDate=Shekin palautumispäivä
 CheckRejected=Shekki palautunut
 CheckRejectedAndInvoicesReopened=Shekki palautunut ja lasku avautunut uudelleen
 BankAccountModelModule=Pankkitilien dokumenttimallit
-DocumentModelSepaMandate=SEPA valtuuden malli. Käyttökelpoinen vain EEC alueen valtioissa
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=BAN tiedon sisältävä tulostusmalli
 NewVariousPayment=Uudet muut maksut
 VariousPayment=Muut maksut
@@ -162,4 +163,6 @@ ShowVariousPayment=Näytä muut maksut
 AddVariousPayment=Lisää muita maksuja
 SEPAMandate=SEPA mandate
 YourSEPAMandate=SEPA-toimeksiantonne
-FindYourSEPAMandate=Tämä on SEPA-valtuutuksesi valtuuttaa yhtiömme suorittamaan suoraveloitusjärjestelyt pankillesi. Palautathan sen allekirjoitettuna (skannattuna allekirjoitettu asiakirja) tai lähettä sen postitse osoitteeseen
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 7215e0c70c9..8713bee26aa 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma lasku
 InvoiceProFormaDesc=<b>Proforma lasku</b> on todellinen lasku, mutta sillä ei ole kirjanpidollista arvoa.
 InvoiceReplacement=Korvaava lasku
 InvoiceReplacementAsk=Laskun korvaava lasku
-InvoiceReplacementDesc=<b>Hyvityslasku</b> käytetään peruuttamaan ja korvaamaan täysin lasku jonka maksua ei ole vielä saatu. <br><br> Huomaa: Vain lasku ilman maksua voidaan hyvittää. Jos sitä ei ole suljettu, se on automaattisesti suljettu "hylätyksi".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Menoilmoitus
 InvoiceAvoirAsk=Menoilmoitus korjata laskun
-InvoiceAvoirDesc=<b>Luoton merkintä</b> on negatiivinen lasku käytetään ratkaista se, että lasku on määrä, joka on erilainen kuin määrä todella maksetaan (koska asiakas maksanut liikaa virheitä, tai ei maksanut kokonaan, koska hän palasi joitakin tuotteita esimerkiksi). <br><br> Huomautus: Alkuperäinen lasku on jo päättynyt ( "maksetaan" tai "maksetaan osittain"), jonka avulla luodaan menoilmoitus sitä.
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Takaisin maksu
 DeletePayment=Poista maksu
 ConfirmDeletePayment=Oletko varma, että haluat poistaa tämän suorituksen?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Tavarantoimittajat maksut
 ReceivedPayments=Vastaanotetut maksut
 ReceivedCustomersPayments=Saatujen maksujen asiakkaille
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Vastatut asiakkaiden maksut validoida
 PaymentsReportsForYear=Maksut raportteja %s
 PaymentsReports=Maksut raportit
@@ -91,8 +91,8 @@ PaymentConditionsShort=Maksuehdot
 PaymentAmount=Maksusumma
 ValidatePayment=Vahvista maksu
 PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa
-HelpPaymentHigherThanReminderToPay=Huomio, maksusumman yhden tai useamman laskut on korkeampi kuin muualla maksamaan. <br> Muokkaa merkintä, muuten vahvistaa ja mieti luoda menoilmoitus sen ylittävältä osalta saatu kunkin overpaid laskut.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Luokittele "Maksettu"
 ClassifyPaidPartially=Luokittele "Osittain maksettu"
 ClassifyCanceled=Luokittele "Hylätty"
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Suljettu (palkaton)
 BillStatusClosedPaidPartially=Maksanut (osittain)
 BillShortStatusDraft=Vedos
 BillShortStatusPaid=Maksetaan
-BillShortStatusPaidBackOrConverted=Hyvitetty tai vaihdettu
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Maksetut
 BillShortStatusCanceled=Hylätty
 BillShortStatusValidated=Validoidut
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Suljettu
 BillShortStatusClosedPaidPartially=Maksanut (osittain)
 PaymentStatusToValidShort=Validoida
-ErrorVATIntraNotConfigured=Intracommunautary alv-numero ei vielä määritelty
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=N: o oletusmaksutapa tilassa määritelty. Siirry Kauppalaskuilmoituksessa moduuli valinnaksi korjata.
 ErrorCreateBankAccount=Luo pankkitiliä, siirry Setup paneeli Kauppalaskuilmoituksessa moduuli määritellä maksutavat
 ErrorBillNotFound=Lasku %s ei ole olemassa
-ErrorInvoiceAlreadyReplaced=Virhe, kun yrität validoida lasku korvata lasku %s. Mutta tässä on jo korvattu laskun %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Virhe, alennus jo käytössä
 ErrorInvoiceAvoirMustBeNegative=Virhe, oikea lasku on negatiivinen määrä
 ErrorInvoiceOfThisTypeMustBePositive=Virhe, tällainen lasku on myönteinen määrä
 ErrorCantCancelIfReplacementInvoiceNotValidated=Virhe ei voi peruuttaa laskun, joka on korvattu toisella laskun, joka on vielä luonnosvaiheessa asema
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Laskuttaja
 BillTo=Vastaanottaja
 ActionsOnBill=Toimet lasku
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Huono asiakas
 ConfirmClassifyPaidPartiallyReasonProductReturned=Tuotteet osittain palautettu
 ConfirmClassifyPaidPartiallyReasonOther=Määrä luovuttamiseen muu syy
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Tämä valinta on mahdollinen, jos lasku on toimitettu sopiva kommentti. (Esimerkki "Vain vero vastaa hintaa, joka on tosiasiallisesti maksettu antaa oikeuksia vähennys»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Joissakin maissa tämä valinta voisi olla mahdollista vain, jos lasku sisältää oikea merkintä.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Käytä tätä vaihtoehtoa, jos kaikki muut ei sovi
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Huono asiakas</b> on asiakas, jotka kieltäytyvät maksaa hänen velkansa.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Tämä valinta on käytössä, kun maksua ei ole täydellinen, koska jotkut tuotteet on palautettu
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Käytä tätä vaihtoehtoa, jos kaikki muut ei sovi, esimerkiksi seuraavassa tilanteessa: <br> - Maksua ei ole täydellinen, koska jotkut tuotteet on lastattu takaisin <br> - Määrä väitti liian tärkeää, koska alennus oli unohtanut <br> Kaikissa tapauksissa, määrä yli-väitti on korjattava kirjanpidon järjestelmän luomalla menoilmoitus.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Muu
 ConfirmClassifyAbandonReasonOtherDesc=Tämä valinta voidaan käyttää kaikissa muissa tapauksissa. Esimerkiksi koska aiot luoda korvaa laskun.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate lasku
 UnvalidateBill=Unvalidate lasku
-NumberOfBills=Nb laskuista
-NumberOfBillsByMonth=Nb laskuista kuukausittain
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Määrä laskuista
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Määrä laskut kuukausittain (verojen jälkeen)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Näytä lasku
@@ -260,9 +262,9 @@ Repeatables=Pohjat
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Asiakas laskut ja laskujen "linjat
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Asiakas laskut ja maksut
-ExportDataset_invoice_1=Asiakas laskujen luettelo ja laskut "linjat
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Asiakas laskut ja maksut
 ProformaBill=Proforma Bill:
 Reduction=Alennusprosentti
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill osoite
-HelpEscompte=Tämä alennus on alennus myönnetään asiakas, koska sen paiement tehtiin ennen aikavälillä.
-HelpAbandonBadCustomer=Tämä määrä on luovuttu (asiakas sanoi olla huono asiakas), ja se on pidettävä exceptionnal väljä.
-HelpAbandonOther=Tämä määrä on luovuttu, koska se oli virhe (väärä asiakas-tai laskunumeroa korvata toinen esimerkki)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Maksu-id
 PaymentRef=Maksuviite
@@ -321,22 +323,22 @@ InvoiceNotChecked=Ei laskun valittu
 CloneInvoice=Klooni lasku
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Toimi vammaisten koska lasku on korvattu
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb maksujen
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split edullisista kahdessa
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input määrä kunkin kahteen osaan:
-TotalOfTwoDiscountMustEqualsOriginal=Yhteensä kaksi uutta alennus on oltava alkuperäinen alennuksen määrästä.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related lasku
 RelatedBills=Related laskut
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Summa on jaettu laskulla
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Maksuviesti
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Rivillä maksu
-PaymentTypeShortVAD=Rivillä maksu
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Luonnos
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Pankkitiedot
 BankCode=Pankin koodi
-DeskCode=Työpöytä-koodi
+DeskCode=Office code
 BankAccountNumber=Tilinumero
-BankAccountNumberKey=Avain
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN-numero
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT-numero
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Maksu tilisiirrolla käyttäen näitä tiliti
 VATIsNotUsedForInvoice=* Ei sovelleta alv taide-293B CGI
 LawApplicationPart1=Soveltamalla lain 80.335 tehty 12/05/80
 LawApplicationPart2=tavaroiden omistusoikeus säilyy
-LawApplicationPart3=myyjän kunnes täydellinen lunastaminen ja
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=niiden hinta.
 LimitedLiabilityCompanyCapital=SARL, pääoma
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Sekit
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Käytä asiakkaiden laskutus osoite sijaan kolmannen osapuolen osoite vastaanottajalle laskut
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Näytä kaikki maksamattomat laskut
 ShowUnpaidLateOnly=Näytä myöhään unpaid laskun vain
 PaymentInvoiceRef=Maksu laskun %s
@@ -474,21 +476,22 @@ Reported=Myöhässä
 DisabledBecausePayments=Ole mahdollista, koska on olemassa joitakin maksuja
 CantRemovePaymentWithOneInvoicePaid=Ei voi poistaa maksua koska siellä on ainakin laskulla luokiteltu maksanut
 ExpectedToPay=Odotettu maksu
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Maksanut tämän maksun
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Maksa
 ToMakePaymentBack=Takaisin maksu
 ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Laskun malli Crabe. Täydellinen laskun malli (Tuki alv vaihtoehto, alennukset, maksut edellytykset, logo, jne. ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Poista laskupohja
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 518e606ab96..cdb672b7dfb 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Näytä yrityksen
 ShowStock=Näytä varasto
 DeleteArticle=Poista napsauttamalla tämän artikkelin
 FilterRefOrLabelOrBC=Etsi (Viite/Otsikko)
-UserNeedPermissionToEditStockToUsePos=Haluat vähentää varastosaldoa laskun luonnin yhteydessä. POS käyttäjä tarvitsee oikeudet muokata varastoa.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr kuittitulostin
+PointOfSale=Point of myynnin
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang
index 6c0fc65e9bd..ae5cd735982 100644
--- a/htdocs/langs/fi_FI/commercial.lang
+++ b/htdocs/langs/fi_FI/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Puhelinsoitto
 ActionAC_FAX=Lähetä faksi
 ActionAC_PROP=Lähetä tarjous sähköpostilla
 ActionAC_EMAIL=Lähetä sähköpostiviesti
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Kokoukset
 ActionAC_INT=Väliintulo paikanpäällä
 ActionAC_FAC=Lähetä laskutustietosi
@@ -72,8 +73,8 @@ StatusProsp=Mahdollisuuden tila
 DraftPropals=Tarjousluonnos
 NoLimit=Rajoittamaton
 ToOfferALinkForOnlineSignature=Linkki sähköiseen allekirjoitukseen
-WelcomeOnOnlineSignaturePage=Tervetuloa tarjouspyyntö hyväksymis sivulle %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=Tämä näyttö sallii sinun hyväksyvän ja allekirjoittavan, tai hylkäävän, lainauksen/tarjouspyynnön
 ThisIsInformationOnDocumentToSign=Tämä on informaatiota dokumentistä hyväksymiseksi tai hylkäämiseksi
-SignatureProposalRef=Tarjouksen/ehdotuksen %s allekirjoitus
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Sähköinen allekirjoitus on poissa käytöstä tai dokumentti on luotu ennen sen käyttöönottoa
diff --git a/htdocs/langs/fi_FI/dict.lang b/htdocs/langs/fi_FI/dict.lang
index 1090a8676bf..f3431ecf235 100644
--- a/htdocs/langs/fi_FI/dict.lang
+++ b/htdocs/langs/fi_FI/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard ja McDonald
 CountryVA=Pyhä istuin (Vatikaanivaltio)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Intia
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Pohjois-Korea
 CountryKR=Etelä-Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lathia
 CountryLV=Latvia
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Montserrat
 CountryMZ=Mosambik
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad ja Tobago
 CountryTR=Turkki
 CountryTM=Turkmenistan
-CountryTC=Turks-ja Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupia
 CurrencySingMUR=Mauritius rupia
 CurrencyNOK=Norja Krones
-CurrencySingNOK=Norja kruunu
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=TND
 CurrencySingTND=Tunisian dinaari
 CurrencyUSD=Dollaria Yhdysvaltain
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Suusanallisesti
 DemandReasonTypeSRC_PARTNER=Kumppani
 DemandReasonTypeSRC_EMPLOYEE=Työntekijä
 DemandReasonTypeSRC_SPONSORING=Sponsorointisuhde
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Muoto 4A0
 PaperFormatEU2A0=Muoto 2A0
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index 48bf507d62a..a2b191e12b3 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Asiakirjojen määrä hakemistossa
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Hakemisto
 ECMSectionManual=Manuaalinen hakemisto
 ECMSectionAuto=Automaattinen hakemisto
@@ -34,6 +34,8 @@ ECMDocsByProjects=Projekteihin liittyvät asiakirjat
 ECMDocsByUsers=Käyttäjiin liittyvät asiakirjat
 ECMDocsByInterventions=Väliintuloon liittyvät asiakirjat
 ECMDocsByExpenseReports=Kuluraportteihin liittyvät asiakirjat
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Hakemistoa ei luotu
 ShowECMSection=Näytä hakemisto
 DeleteSection=Poista hakemisto
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index c6b9f3b7359..cb3e50b2421 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP ohjelma epäonnistui virheellä '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fi_FI/help.lang b/htdocs/langs/fi_FI/help.lang
index 8f0e787f74b..9221906d555 100644
--- a/htdocs/langs/fi_FI/help.lang
+++ b/htdocs/langs/fi_FI/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online reaaliajassa / etätuki
 OtherSupport=Muut tuet
 ToSeeListOfAvailableRessources=Voit ottaa yhteyttä / nähdä käytettävissä olevat varat:
 HelpCenter=Ohjekeskukseen
-DolibarrHelpCenter=Dolibarr apua ja tukea keskus
-ToGoBackToDolibarr=Muuten napsauta <a href="%s">tästä käyttää Dolibarr</a>
-TypeOfSupport=Tuen lähde
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Yhteisössä (vapaa)
 TypeSupportCommercial=Kaupalliset
 TypeOfHelp=Tyyppi
@@ -15,12 +15,9 @@ NeedHelpCenter=Tarvitsetko apua tai tukea?
 Efficiency=Tehokkuus
 TypeHelpOnly=Ohje vain
 TypeHelpDev=Ohje + kehittämisen
-TypeHelpDevForm=Ohje + Development + Formation
-ToGetHelpGoOnSparkAngels1=Jotkin yritykset voivat tarjota nopea (joskus välittömästi) ja tehokkaampaa online tukea ottamalla tietokoneen. Tällainen avustushenkilöstö <b>löytyy %s</b> www-sivusto:
-ToGetHelpGoOnSparkAngels3=Voit myös mennä luettelo kaikista käytettävissä valmentajia varten Dolibarr, tästä klikkaamalla painiketta
-ToGetHelpGoOnSparkAngels2=Joskus ei ole yhtiön käytettävissä tällä hetkellä teet haun, niin mielestäni muuttaa suodattimen etsiä "kaikkien saatavilla". Voit lähettää lisää pyyntöjä.
-BackToHelpCenter=Muussa tapauksessa, klikkaa tästä ja mennä <a href="%s">takaisin ohjekeskukseen kotisivu.</a>
-LinkToGoldMember=Voit soittaa yksi valmentaja valittua on Dolibarr for your language ( %s) napsauttamalla hänen Widget (status ja enimmäishinta päivittyvät automaattisesti):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Tuetut kielet
-SubscribeToFoundation=Auta Dolibarr projektia, tilaa 
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Virallinen Dolibarr tuki omalla kielellä: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index c421c02c9be..07d67b83096 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+HRM=Henkilöstöhallinta
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Aloituspäivämäärä
 DateFinCP=Lopetuspäivä
@@ -15,13 +15,18 @@ ApprovedCP=Hyväksytty
 CancelCP=Peruttu
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Kuvaus
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Muokkaa
 DeleteCP=Poistaa
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Syy
 UserCP=Käyttäjä
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 53f91c364dc..79203deaa05 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Seuraa ohjeita askel askeleelta.
 MiscellaneousChecks=Ehtojen tarkistus
 ConfFileExists=Asetustiedosto <b>%s</b> on olemassa.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Asetustiedostoa <b>%s</b> ei ole olemassa, ja sitä ei voi luoda!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Asetustiedosto <b>%s</b> voitaisiin luoda.
-ConfFileIsNotWritable=Asetustiedosto <b>%s</b> ei ole kirjoitettavissa. Tarkista käyttöoikeudet. Ensimmäistä kertaa asennettaessa, verkkopalvelimesi on annettava kirjoituslupa tämän asetusprosessin aikana asennus ( esimerkiksi "chmod 666"  Unix tyylisisä OSsiessa).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration <b>file %s</b> on kirjoitettavissa.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Uudelleen lataa kaikki tiedot asetustiedostosta.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET.
-PHPSupportPOSTGETKo=On mahdollista, sinun PHP asennusohjelma ei tue muuttujat POST tai GET. Tarkista parametri <b>variables_order</b> vuonna php.ini.
-PHPSupportGD=Tämä PHP tukea GD graafisia toimintoja.
-PHPSupportCurl=Tämä PHP tukee Curl.
-PHPSupportUTF8=Tämä PHP tukea UTF8 toimintoja.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pitäisi olla tarpeeksi.
-PHPMemoryTooLow=Sinun PHP max istuntojakson muisti on <b>asetettu %s</b> tavua. Tämä olisi liian alhainen. Change your <b>php.ini</b> asettaa <b>memory_limit</b> parametri <b>vähintään %s</b> tavua.
-Recheck=Click here for a enemmän significative testi
-ErrorPHPDoesNotSupportSessions=Sinun PHP asennus ei tue istunnoissa. Tämä ominaisuus on velvollisuus tehdä Dolibarr toimi. Tarkista PHP-asetukset.
-ErrorPHPDoesNotSupportGD=Sinun PHP asennus ei tue graafisia toiminto GD. N: o kaavio on saatavilla.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Sinun PHP asennuksesi ei tue Curl.
-ErrorPHPDoesNotSupportUTF8=Sinun PHP asennus ei tue UTF8 toimintoja. Dolibarr ei toimi oikein. Ratkaise tämä ennen asennusta Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Hakemiston %s ei ole olemassa.
-ErrorGoBackAndCorrectParameters=Siirry taaksepäin ja korjata väärin parametrit.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Olet ehkä kirjoittanut väärän arvon parametri ' %s'.
 ErrorFailedToCreateDatabase=Luominen epäonnistui tietokanta ' %s'.
 ErrorFailedToConnectToDatabase=Epäonnistui muodostaa tietokanta ' %s'.
 ErrorDatabaseVersionTooLow=Tietokannan versio (%s) on liian vanha. Versio %s tai korkeampi on tarpeen.
 ErrorPHPVersionTooLow=PHP versio liian vanha. Versio %s on tarpeen.
-ErrorConnectedButDatabaseNotFound=Yhteys palvelimeen onnistunut mutta tietokantaan %s ei löydy.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database ' %s' on jo olemassa.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Jos tietokanta ei ole, palaa takaisin ja tarkistaa vaihtoehto "Luo tietokanta".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Jos tietokanta on jo olemassa, mene takaisin ja poista "Luo tietokanta" vaihtoehto.
-WarningBrowserTooOld=Selaimesi versio on liian vanha. Selaimen päivitys tuoreimpaan versioon on suositeltavaa. Suosittelemme selaimeksi Firefoxia, Chromea tai Operaa.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Käyttämällä lisenssi
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Tietokannan tyyppi
 DriverType=Driver tyyppi
 Server=Server
-ServerAddressDescription=Nimi tai IP-osoite tietokanta palvelimelle, yleensä "localhost", kun tietokanta-palvelimen isännöidään samalla palvelimella kuin web-palvelin
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Tietokanta-palvelimen portti. Pidä tyhjä, jos tuntematon.
 DatabaseServer=Database Server
 DatabaseName=Tietokannan nimi
-DatabasePrefix=Tietokanta etuliite pöytä
-AdminLogin=Kirjautumistunnuksen Dolibarr tietokannan ylläpitäjä. Pidä tyhjä jos kytket nimettömässä
-PasswordAgain=Kirjoita salasana uudelleen toisen kerran
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Salasana Dolibarr tietokannan ylläpitäjä. Pidä tyhjä jos kytket nimettömässä
 CreateDatabase=Luo tietokanta
-CreateUser=Luo omistaja tai anna hänelle pääsyoikeus tietokantaan
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Tietokanta - SuperUser pääsy
-CheckToCreateDatabase=Valintaruutu, jos tietokanta ei ole olemassa, ja ne on luotu. <br> Tässä tapauksessa sinun täytyy täyttää tunnus / salasana SuperUser huomioon alareunassa tällä sivulla.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Kirjaudu että käyttäjä voi luoda uusia tietokantoja tai uusia käyttäjiä, hyödytön, jos tietokanta ja tietokanta on jo olemassa (kuten silloin, kun olet isännöi Web hosting-palvelujen tarjoaja).
-KeepEmptyIfNoPassword=Jätä tyhjä, jos käyttäjä ei ole salasanaa (välttää)
-SaveConfigurationFile=Tallenna arvot
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Palvelinyhteys
 DatabaseCreation=Tietokannan luominen
 CreateDatabaseObjects=Tietokannan objektien luominen
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Luo ulko avaimet ja hakemistot pöytä %s
 OtherKeysCreation=Ulko-avaimet ja hakemistot luominen
 FunctionsCreation=Toiminnot luominen
 AdminAccountCreation=Administrator sisäänkirjoittautumissivuksesi luominen
-PleaseTypePassword=Kirjoita salasana, tyhjät salasanat eivät ole sallittuja!
-PleaseTypeALogin=Kirjoita kirjautumisen!
-PasswordsMismatch=Salasanat vaihtelee, yritä uudelleen!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=Tämä asennus on valmis.
 SystemIsUpgraded=Dolibarr on päivitetty onnistuneesti.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr vastaamaan tarpeisiin (
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Siirry Dolibarr
 GoToSetupArea=Siirry Dolibarr (setup-alue)
-MigrationNotFinished=Version tietokanta ei ole täysin ajan tasalla, joten sinun täytyy suorittaa päivityksen uudelleen.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Siirry päivittää sivu uudelleen
 WithNoSlashAtTheEnd=Ilman kauttaviivalla "/" lopussa
-DirectoryRecommendation=On recommanded käyttää hakemiston ulkopuolella teidän hakemistoon verkkosivuja.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=On jo olemassa
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr järjestelmänvalvojan tili <b>' %s'</b> on jo olemassa.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Dolibarr ylläpitokäyttäjän luominen epäonnistui
-WarningRemoveInstallDir=Varoitus, turvallisuussyistä, kun asennus tai päivitys on valmis, poista <b>asennus hakemistoon tai nimetä sen install.lock välttämiseksi sen ilkivaltaisten käyttöä.</b>
-FunctionNotAvailableInThisPHP=Ei saatavana tämän PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Valittu siirtyä script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script käsittely
 ChooseYourSetupMode=Valitse setup-tilaan ja klikkaa "Käynnistä" ...
 FreshInstall=Tuore asentaa
-FreshInstallDesc=Käytä tätä tilaa, jos tämä on ensimmäinen asentaa. Jos ei, tämän voi korjata edellisen epätäydellinen asentaa, mutta jos haluat päivittää version, valitse "Päivitä"-tilassa.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Päivitys
 UpgradeDesc=Käytä tätä tilaa, jos sinulla on korvattu vanha Dolibarr tiedostoja tiedostot uudemmalla versiolla. Tämä päivittää tietokantaan ja tietoja.
 Start=Alku
 InstallNotAllowed=Asennusohjelma ei sallita <b>conf.php</b> käyttöoikeudet
 YouMustCreateWithPermission=Sinun on luotava tiedosto %s ja asettaa kirjoittaa oikeudet sen Web-palvelimen aikana asentaa prosessiin.
-CorrectProblemAndReloadPage=Korjaa ongelma ja paina F5-näppäintä reload sivulla.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Jo siirtynyt
 DatabaseVersion=Database versio
 ServerVersion=Database Server versio
 YouMustCreateItAndAllowServerToWrite=Sinun on luotava tähän hakemistoon ja mahdollistaa web-palvelin voi kirjoittaa sitä.
 DBSortingCollation=Luonne lajittelu jotta
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Te kysytte luoda <b>tietokanta %s,</b> mutta tästä Dolibarr tarvitse liittää <b>palvelimeen %s</b> Super <b>käyttäjän %s</b> käyttöoikeudet.
-YouAskLoginCreationSoDolibarrNeedToConnect=Te kysytte luoda tietokanta <b>sisäänkirjoittautumissivuksesi %s,</b> mutta tästä Dolibarr tarvitse liittää <b>palvelimeen %s</b> Super <b>käyttäjän %s</b> käyttöoikeudet.
-BecauseConnectionFailedParametersMayBeWrong=Kuten yhteys epäonnistui, isännän tai super käyttäjä parametrit on väärässä.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphelins maksu havaittu menetelmä %s
 RemoveItManuallyAndPressF5ToContinue=Poistaa sen manuaalisesti ja paina F5 jatkaa.
 FieldRenamed=Kenttä uudelleennimetty
-IfLoginDoesNotExistsCheckCreateUser=Jos kirjautuminen ei ole vielä, sinun täytyy tarkistaa vaihtoehto "Luo käyttäjä"
-ErrorConnection=Server <b>" %s"</b> Tietokannan nimi <b>" %s",</b> login <b>" %s",</b> tai tietokannan salasana olla väärässä tai PHP asiakkaan versio voi olla liian vanha verrattuna tietokannan versiota.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Suositeltava valinta asentaa version <b>%s</b> nykyisestä versiosta <b>%s</b>
 InstallChoiceSuggested=<b>Asenna valinta ehdotti installer.</b>
-MigrateIsDoneStepByStep=Kohdistettu versio (%s) on rako useita versioita, joten ohjatun asennuksen palaa ehdottaa ensi muuttoliikkeen kerran tämä valmistuu.
-CheckThatDatabasenameIsCorrect=Tarkista, että tietokannan nimi <b>"%s"</b> on oikea.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Jos tämä nimi on oikea ja että tietokanta ei ole vielä olemassa, sinun täytyy tarkistaa vaihtoehto "Luo tietokanta".
 OpenBaseDir=PHP openbasedir parametri
-YouAskToCreateDatabaseSoRootRequired=Olet ruudun "Luo tietokanta". Tätä varten sinun pitää / salasana on pääkäyttäjän (pohjan muoto).
-YouAskToCreateDatabaseUserSoRootRequired=Olet ruudun "Luo tietokanta omistaja". Tätä varten sinun pitää / salasana on pääkäyttäjän (pohjan muoto).
-NextStepMightLastALongTime=Nykyinen vaihe saattaa kestää useita minuutteja. Odota, kunnes seuraava näyttö näkyy kokonaan ennen kuin jatkat.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Siirrä toimituskuluja asiakastilausten varastointi
 MigrationShippingDelivery=Päivitä varastointi merenkulun
 MigrationShippingDelivery2=Päivitä varastointi merenkulun 2
 MigrationFinished=Muuttoliike valmis
-LastStepDesc=<strong>Viimeinen askel:</strong> Määritä tässä käyttäjätunnuksen ja salasanan aiot käyttää yhteyden ohjelmisto. Älä löysä tämä on tilin hallinnoida kaikkia muita.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktivoi moduuli %s
 ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=Voit käyttää DoliWamp ohjattua, joten arvojen suhteen täällä on jo optimoitu. Muuttaa vain, jos tiedät mitä teet.
-KeepDefaultValuesDeb=Voit käyttää Dolibarr ohjatun peräisin Ubuntu tai Debian-pakettien, joten ehdottamat arvot tässä on jo optimoitu. Vain salasanan tietokannan omistajan luoda on täytettävä. Muuta muut parametrit vain, jos tiedät mitä teet.
-KeepDefaultValuesMamp=Voit käyttää DoliMamp ohjattua, joten arvojen suhteen täällä on jo optimoitu. Muuttaa vain, jos tiedät mitä teet.
-KeepDefaultValuesProxmox=Käytät Dolibarr ohjatun päässä Proxmox virtuaalinen laite, joten ehdotetut arvot tässä on jo optimoitu. Muuta niitä vain, jos tiedät mitä teet.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Tietojen siirtäminen kaupallisiin ehdotuksia
 MigrationInvoice=Tietojen siirtäminen asiakkaiden laskut
 MigrationContract=Tietojen siirtäminen sopimusten
-MigrationSuccessfullUpdate=Päivitys onnistui
+MigrationSuccessfullUpdate=Päivitys onnistunut
 MigrationUpdateFailed=Epäonnistui päivitysprosessi
 MigrationRelationshipTables=Tiedot maahanmuuton suhteen taulukot (%s)
 MigrationPaymentsUpdate=Maksu tietojen korjaus
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Sopimus tietojen korjaus
 MigrationContractsNumberToUpdate=%s sopimuksen (t) päivitys
 MigrationContractsLineCreation=Luo sopimus linja sopimustavaroiden ref %s
 MigrationContractsNothingToUpdate=Ei enää Muistettavaa
-MigrationContractsFieldDontExist=Kenttä fk_facture ei ole enää. Mitään ei tehdä.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Sopimus tyhjä päivämäärä korjaus
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Mitään sopimusta ei tyhjä päivämäärä korjata
 MigrationContractsEmptyCreationDatesNothingToUpdate=Mitään sopimusta ei luontipäivämäärä korjata
 MigrationContractsInvalidDatesUpdate=Bad arvopäivä sopimuksen korjaus
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Toimitus päivitys
 MigrationStockDetail=Päivitä varastossa tuotteiden arvosta
 MigrationMenusDetail=Päivitä dynaaminen valikot taulukot
 MigrationDeliveryAddress=Päivitä toimitusosoite kuljetusta
-MigrationProjectTaskActors=Tiedot maahanmuuton llx_projet_task_actors taulukko
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Tietojen siirtäminen alalla fk_user_resp ja llx_projet on llx_element_contact
 MigrationProjectTaskTime=Päivitä aika sekunneissa
 MigrationActioncommElement=Päivitä tiedot toimista
 MigrationPaymentMode=Tiedot muuttoliike maksua tilassa
 MigrationCategorieAssociation=Kategorioiden siirto 
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Lataa uudelleen moduuli %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Näytä ei saatavilla olevat valinnat
-HideNotAvailableOptions=Piilota ei saatavilla olevat valinnat
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 0ab2aded356..a711cc2dab9 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Sidosryhmien yhteystiedot
 ContactsAddressesForCompany=Sidosryhmien kontaktit/osoitteet
 AddressesForCompany=Sidosryhmien osoitteet
 ActionsOnCompany=Sidosryhmien tapahtumat
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Jäsenen tapahtumat
 ActionsOnProduct=Tapahtumat tästä tuotteesta
 NActionsLate=%s myöhässä
@@ -847,9 +848,9 @@ ModuleBuilder=Moduuli Rakentaja
 SetMultiCurrencyCode=Aseta valuutta
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Nettisivu
+WebSite=Website
 WebSites=Nettisivut
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Website accounts
 ExpenseReport=Kustannusraportti
 ExpenseReports=Kuluraportit
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index ac722be4e7e..027dedfb83e 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linkitettyä objektia
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titteli
 WEBSITE_DESCRIPTION=Kuvaus
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/fi_FI/paybox.lang b/htdocs/langs/fi_FI/paybox.lang
index 614de447f2c..061793ca5a8 100644
--- a/htdocs/langs/fi_FI/paybox.lang
+++ b/htdocs/langs/fi_FI/paybox.lang
@@ -3,14 +3,14 @@ PayBoxSetup=PayBox moduulin asetukset
 PayBoxDesc=Tämä moduuli tarjota sivuja, jotta maksua <a href="http://www.paybox.com" target="_blank">Paybox</a> asiakkaat. Tätä voidaan käyttää vapaa-maksun tai maksaa tietyn Dolibarr objektin (lasku-, tilaus-, ...)
 FollowingUrlAreAvailableToMakePayments=Seuraavat URL-osoitteet ovat käytettävissä tarjota sivu asiakas tehdä maksua Dolibarr esineitä
 PaymentForm=Maksu-muodossa
-WelcomeOnPaymentPage=Tervetuloa verkkomaksupalveluumme
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Tässä näytössä voit tehdä online-maksu %s.
 ThisIsInformationOnPayment=Tämä on informations maksua tehdä
 ToComplete=Saattamaan
 YourEMail=Sähköposti maksupyyntö vahvistus
 Creditor=Velkoja
 PaymentCode=Maksu-koodi
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Maksa luotto tai debit kortilla (Paybox)
 ToPay=Ei maksua
 YouWillBeRedirectedOnPayBox=Sinut ohjataan on turvattu Paybox sivu tuloliittimeen voit luottokortin tiedot
 Continue=Seuraava
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL tarjota %s online maksu käyttöliitty
 ToOfferALinkForOnlinePaymentOnContractLine=URL tarjota %s online maksu käyttöliittymän sopimuksen linjan
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL tarjota %s online maksu käyttöliittymän vapaa määrä
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL tarjota %s online maksu käyttöliittymän jäsen tilaus
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Voit myös lisätä URL-parametrin <b>& tag= <i>arvo</i></b> mille tahansa niistä URL (vaaditaan ainoastaan ilmaiseksi maksu) lisätään oma maksu kommentoida tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Määritä oman PayBox kanssa <b>url %s</b> on maksu luodaan automaattisesti, kun validoinut paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Tämä sivu vahvistaa, että maksu on kirjattu. Kiitos.
-YourPaymentHasNotBeenRecorded=Et maksua ei ole kirjattu, ja kauppa on peruutettu. Kiitos.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Tilin parametrit
 UsageParameter=Käyttöparametrien
 InformationToFindParameters=Auta löytää %s tilitiedot
diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang
index df4f10ce5fa..e7aa7bc8a5b 100644
--- a/htdocs/langs/fi_FI/propal.lang
+++ b/htdocs/langs/fi_FI/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Allekirjoitettu (laskuttaa)
 PropalStatusNotSigned=Ei ole kirjautunut (suljettu)
 PropalStatusBilled=Laskutetun
 PropalStatusDraftShort=Vedos
-PropalStatusValidatedShort=Hyväksytty
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Suljettu
 PropalStatusSignedShort=Allekirjoitettu
 PropalStatusNotSignedShort=Ei ole kirjautunut
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s ei löydy
 AddToDraftProposals=Lisää tarjousluonnos
 NoDraftProposals=Ei tarjousluonnoksia
 CopyPropalFrom=Luo tarjous kopioimalla olemassa oleva tarjous pohjaksi
-CreateEmptyPropal=Luo tyhjä tarjous vierge tai luettelo tuotteet / palvelut
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Tarjouksen oletus voimassaolo (päivinä)
-UseCustomerContactAsPropalRecipientIfExist=Käytä asiakkaan yhteystiedot, jos se on määritetty sijaan kolmannen osapuolen osoite ehdotus vastaanottajan osoite
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klooni kaupallinen ehdotus
 ConfirmClonePropal=Haluatko varmasti monistaa tarjouksen <b>%s</b>?
 ConfirmReOpenProp=Haluatko varmasti avata uudestaan tarjouksen <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Asiakkaan yhteystiedot tarjouksen seurantaa
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Kokonainen tarjouspohja (logo...)
+DocModelCyanDescription=Kokonainen tarjouspohja (logo...)
 DefaultModelPropalCreate=Oletusmallin luonti
 DefaultModelPropalToBill=Oletus pohja suljettavalle tarjoukselle (laskutukseen)
 DefaultModelPropalClosed=Oletus pohja suljettavalla tarjoukselle (laskuttamaton)
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index fc43a07e324..25540b60bc5 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Koodi
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Luettu
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 2efb3b815ba..ad93ef9427b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Outils multi-modules
 ModuleFamilyExperimental=Modules expérimentaux
 ModuleFamilyFinancial=Modules financiers (Compta/trésorerie)
 ModuleFamilyECM=Gestion électronique de documents (GED)
-ModuleFamilyPortal=Sites web et autres applications frontales
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces avec des systèmes externes
 MenuHandlers=Gestionnaires de menu
 MenuAdmin=Édition menu
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=Répertoire racine où tous les fichiers sont télécha
 Module0Name=Utilisateurs & Groupes
 Module0Desc=Gestion des utilisateurs / employés et groupes
 Module1Name=Tiers
-Module1Desc=Gestion des tiers (clients, prospects) et contacts
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Gestion commerciale
 Module10Name=Comptabilité
@@ -624,8 +624,8 @@ Module50000Name=PayBox
 Module50000Desc=Module permettant d'offrir une page de paiement en ligne par carte de crédit avec PayBox. Ceci peut être utilisé par les clients pour faire des paiements de montants libre ou pour des paiements d'un objet particulier de Dolibarr (facture, commande, ...)
 Module50100Name=Point de vente
 Module50100Desc=Module Caisse enregistreuse - Point de vente (POS)
-Module50150Name=Caisse enregistreuses
-Module50150Desc=Module de point de vente (POS à écran tactile).
+Module50150Name=Point de vente (tactile)
+Module50150Desc=Module de caisse enregistreuse. Point De Vente (POS en anglais) à écran tactile.
 Module50200Name=Paypal
 Module50200Desc=Module permettant d'offrir une page de paiement en ligne par carte de crédit avec PayBox. Ceci peut être utilisé par les clients pour faire des paiements de montants libre ou pour des paiements d'un objet particulier de Dolibarr (facture, commande, ...)
 Module50400Name=Comptabilité (avancée)
@@ -903,7 +903,7 @@ DictionaryRevenueStamp=Montants des timbres fiscaux
 DictionaryPaymentConditions=Conditions de règlement
 DictionaryPaymentModes=Modes de paiements
 DictionaryTypeContact=Types de contacts/adresses
-DictionaryTypeOfContainer=Type de pages/conteneurs de site Web
+DictionaryTypeOfContainer=Type de pages/container de site Web
 DictionaryEcotaxe=Barèmes Eco-participation (DEEE)
 DictionaryPaperFormat=Format papiers
 DictionaryFormatCards=Formats des cartes
@@ -1843,6 +1843,7 @@ LoadThirdPartyFromName=Charger le tiers à partir du nom (charger uniquement)
 LoadThirdPartyFromNameOrCreate=Charger le tiers à partir du nom (créer si non trouvé)
 WithDolTrackingID=ID Tracker Dolibarr trouvé
 WithoutDolTrackingID=ID Tracker Dolibarr non trouvé
+FormatZip=Code postal
 ##### Resource ####
 ResourceSetup=Configuration du module Ressource
 UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index eab94129dfd..ac689ef4e18 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -164,3 +164,5 @@ AddVariousPayment=Créer paiements divers
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 6f3af1576f6..5ac48903600 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -32,12 +32,13 @@ DeleteArticle=Cliquez pour enlever cet article
 FilterRefOrLabelOrBC=Recherche (Ref/Lib.)
 UserNeedPermissionToEditStockToUsePos=Vous demandez de réduire le stock lors de la création de la facture. L'utilisateur qui utilise le Point De Vente doit donc avoir l'autorisation de modifier le stock.
 DolibarrReceiptPrinter=Imprimante reçu
-PointOfSale=Caisse enregistreuses
+PointOfSale=Point de Vente
+PointOfSaleShort=POS
 CloseBill=Fermer la facture
 Floors=Etages
 Floor=Etage
 AddTable=Ajouter une table
 Place=Marché
-TakeposConnectorNecesary=Application 'TakePOS Connector' requise
+TakeposConnectorNecesary='TakePOS Connector' required
 OrderPrinters=Commande imprimantes
 SearchProduct=Rechercher un produit
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index 076c5e5e005..932e41305b0 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -295,7 +295,7 @@ CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=millime
 #### Input reasons #####
-DemandReasonTypeSRC_INTE=Internet 
+DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Campagne Publipostage
 DemandReasonTypeSRC_CAMP_EMAIL=Campagne d'emailing
 DemandReasonTypeSRC_CAMP_PHO=Campagne Téléphonique
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Bouche à oreille
 DemandReasonTypeSRC_PARTNER=Partenaire
 DemandReasonTypeSRC_EMPLOYEE=Employé
 DemandReasonTypeSRC_SPONSORING=Parrainage/Sponsoring
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index dccaf7181dd..e7e330c1279 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents associés aux projets
 ECMDocsByUsers=Documents associés aux utilisateurs
 ECMDocsByInterventions=Documents associés aux interventions
 ECMDocsByExpenseReports=Documents associés aux notes de frais
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Aucun répertoire créé
 ShowECMSection=Afficher répertoire
 DeleteSection=Suppression répertoire
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 1a4ea8399ea..c33fad420ec 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -211,7 +211,7 @@ ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut que la clé de partage
 ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un produit virtuel pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
 ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
-ErrorAPageWithThisNameOrAliasAlreadyExists=La page / conteneur <strong> %s </strong> a le même nom ou un autre alias que celui que vous tentez d'utiliser.
+ErrorAPageWithThisNameOrAliasAlreadyExists=La page / container <strong> %s </strong> a le même nom ou un autre alias que celui que vous tentez d'utiliser.
 ErrorDuringChartLoad=Erreur lors du chargement du tableau de compte. Si certains comptes n'ont pas été chargés, vous pouvez toujours les entrer manuellement.
 # Warnings
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 2799105a3e8..6916df8ba60 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -112,7 +112,7 @@ NoticePeriod=Délai de prévenance
 HolidaysToValidate=Valider les demandes de congés
 HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés à valider.
 HolidaysToValidateDelay=Cette demande de congés a été effectuée dans un délai de moins de %s jours avant ceux-ci.
-HolidaysToValidateAlertSolde=L'utilisateur ayant fait cette demande de congés payés n'a pas le solde requis.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validation de la demande de congés
 HolidaysValidatedBody=Votre demande de congés du %s au %s vient d'être approuvée.
 HolidaysRefused=Congés refusés
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index d26e8b95d6c..6774bf12834 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -200,6 +200,7 @@ MigrationRemiseEntity=Mettre à jour le champ "entity" de la table "llx_societe_
 MigrationRemiseExceptEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise_except"
 MigrationUserRightsEntity=Mise à jour du champ entity de llx_user_rights
 MigrationUserGroupRightsEntity=Mise à jour du champ entity de llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Rechargement du module %s
 MigrationResetBlockedLog=Réinitialiser le module BlockedLog pour l'algorithme v7
 ShowNotAvailableOptions=Afficher les options non disponibles
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index f5f162d43cd..1b6468fb574 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -837,7 +837,7 @@ Calendar=Calendrier
 GroupBy=Grouper par...
 ViewFlatList=Voir vue liste
 RemoveString=Supprimer la chaine '%s'
-SomeTranslationAreUncomplete=Certaines des langues proposées peuvent ne pas être traduites partiellement ou contenir des erreurs. Aidez-nous à corriger votre langue en vous inscrivant à l'adresse <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/. < / a> ajouter vos améliorations.
+SomeTranslationAreUncomplete=Certaines des langues proposées peuvent n'être traduites que partiellement ou contenir des erreurs. Aidez-nous à corriger votre langue en vous inscrivant à l'adresse <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> pour ajouter vos améliorations.
 DirectDownloadLink=Lien de téléchargement direct (public/externe)
 DirectDownloadInternalLink=Lien de téléchargement direct (requiert d'être logué et autorisé)
 Download=Téléchargement
@@ -848,9 +848,9 @@ ModuleBuilder=Générateur de Module
 SetMultiCurrencyCode=Choisir la devise
 BulkActions=Actions de masse
 ClickToShowHelp=Cliquez pour montrer l'info-bulle d'aide
-WebSite=Site web
+WebSite=Website
 WebSites=Sites web
-WebSiteAccounts=Comptes de site web
+WebSiteAccounts=Website accounts
 ExpenseReport=Note de frais
 ExpenseReports=Notes de frais
 HR=HR
diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang
index 1d85f539784..55daf2154a2 100644
--- a/htdocs/langs/fr_FR/opensurvey.lang
+++ b/htdocs/langs/fr_FR/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Titre sondage
 ToReceiveEMailForEachVote=Recevoir un email à chaque vote
 TypeDate=Type date
 TypeClassic=Type classique
-OpenSurveyStep2=Sélectionnez vos dates parmi les jours gratuits (gris). Les jours sélectionnés sont verts. Vous pouvez désélectionner un jour précédemment sélectionné en cliquant à nouveau dessus.
+OpenSurveyStep2=Sélectionner les dates parmis les jours libres (en gris). Les jours sélectionnés sont verts. Vous pouvez dé-sélectionner un jour en cliquant à nouveau dessus.
 RemoveAllDays=Efface tous les jours
 CopyHoursOfFirstDay=Copier heures du premier jour
 RemoveAllHours=Efface toutes les heures
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index d6d7f092877..ebb13aca043 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -262,6 +262,6 @@ WEBSITE_PAGEURL=URL de la page
 WEBSITE_TITLE=Titre
 WEBSITE_DESCRIPTION=Description
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Chemin relatif du média image. Vous pouvez garder ce champ vide car il est rarement utilisé (cela peut être utilisé par du contenu dynamique pour afficher un aperçu de page de type "blog_post").
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Mots clés
 LinesToImport=Lignes à importer
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index d7d925f3c19..2b1e2371731 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -3,7 +3,7 @@ Shortname=Code
 WebsiteSetupDesc=Créez ici les sites Web que vous souhaitez utiliser. Ensuite, allez dans le menu Sites Web pour les éditer.
 DeleteWebsite=Effacer site web
 ConfirmDeleteWebsite=Êtes-vous sûr de vouloir supprimer ce site web. Toutes les pages et le contenu seront également supprimés.
-WEBSITE_TYPE_CONTAINER=Type de page / conteneur
+WEBSITE_TYPE_CONTAINER=Type de page / container
 WEBSITE_PAGE_EXAMPLE=Page Web à utiliser comme exemple
 WEBSITE_PAGENAME=Nom/alias de la page
 WEBSITE_ALIASALT=Noms de page / alias alternatifs
@@ -13,27 +13,27 @@ WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages)
 WEBSITE_JS_INLINE=Contenu du fichier Javascript (commun à toutes les pages)
 WEBSITE_HTML_HEADER=Ajout en bas de l'en-tête HTML (commun à toutes les pages)
 WEBSITE_ROBOT=Fichier robot (robots.txt)
-WEBSITE_HTACCESS=Fichier .htaccess du site web
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=En-tête HTML (spécifique pour la page uniquement)
 PageNameAliasHelp=Nom ou alias de la page. <br>Cet alias est également utilisé pour forger une URL SEO lorsque le site Web est exécuté à partir d'un hôte virtuel d'un serveur Web (comme Apache, Nginx, ...). Utilisez le bouton "<strong>%s</strong>" pour modifier cet alias.
-EditTheWebSiteForACommonHeader=Remarque: Si vous souhaitez définir un en-tête personnalisé pour toutes les pages, modifiez l'en-tête au niveau du site plutôt qu'au niveau page/conteneur.
+EditTheWebSiteForACommonHeader=Remarque: Si vous souhaitez définir un en-tête personnalisé pour toutes les pages, modifiez l'en-tête au niveau du site plutôt qu'au niveau page/container.
 MediaFiles=Répertoire de médias
 EditCss=Modifier les propriétés du site web
 EditMenu=Modifier menu
 EditMedias=Editer médias
-EditPageMeta=Modifier les propriétés de la page/conteneur
+EditPageMeta=Modifier les propriétés de la page/container
 EditInLine=Editer en ligne
 AddWebsite=Ajouter site web
-Webpage=Page/contenair Web
-AddPage=Ajouter une page/conteneur
+Webpage=Page/container Web
+AddPage=Ajouter une page/container
 HomePage=Page d'accueil
-PageContainer=Page/conteneur
+PageContainer=Page/container
 PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web <strong>%s</strong> n'est pas disponible actuellement. Vous devez d'abord '<strong>Importer un modèle de site web complet</strong>' ou juste '<strong>Ajouter une page/container</strong>.
 RequestedPageHasNoContentYet=La page demandée avec l'id=%s ne présente encore aucun contenu ou le fichier cache .tpl.php a été supprimé. Ajoutez du contenu à la page pour résoudre cela.
 SiteDeleted=Site Web '%s' supprimé
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' du site '%s' supprimée
-PageAdded=Page/Contenair '%s' ajoutée
+PageContent=Page/Container
+PageDeleted=Page/Container '%s' du site '%s' supprimée
+PageAdded=Page/Container '%s' ajoutée
 ViewSiteInNewTab=Pré-visualiser le site dans un nouvel onglet
 ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet
 SetAsHomePage=Définir comme page d'accueil
@@ -52,33 +52,33 @@ YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importe
 SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe 
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>Vous pouvez inclure du code PHP dans le source en utilisant le tags <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $langs, $db, $mysoc, $user, $website, $websitepage, $weblang.<br><br><span class="fa fa-bug"></span>Vous pouvez aussi inclure le contenu d'une autre page/containeur avec la syntaxe suivante:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>Vous pouvez faire une redirection sur une autre Page/Containeur avec la syntax (Note: N'afficher pas de contenu avant un redirect): <br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span>Pour ajouter un lien vers une autre page, utilisez la syntax <br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span>Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire <strong>documents</strong>utilisez le wrapper <strong>documents.php</strong>:<br>Example, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans documents/mdedias (répertoire ouvert au publique), la syntaxe est:<br><strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir]/filename.ext"&gt;.</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span>Pour inclure une <strong>image</strong> stockée dans le répertoire <strong></strong>documents, utilisez le wrapper <strong>viewimage.php</strong>:<br> Example, pour une image dans documents/medias (accès ouvert), la syntax est: <br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-ClonePage=Cloner la page/contenair
+ClonePage=Cloner la page/container
 CloneSite=Cloner le site
-SiteAdded=Site web ajouté
+SiteAdded=Website added
 ConfirmClonePage=Veuillez entrer le code/alias de la nouvelle page et s'il s'agit d'une traduction de la page clonée.
 PageIsANewTranslation=La nouvelle page est une traduction de la page en cours ?
 LanguageMustNotBeSameThanClonedPage=Vous clonez une page comme traduction. La langue de la nouvelle page doit être différente de la langue de la page source.
 ParentPageId=Id de la page parent
 WebsiteId=ID site web
-CreateByFetchingExternalPage=Créer une page / un conteneur en récupérant une page à partir d'une URL externe ...
+CreateByFetchingExternalPage=Créer une page / un container en récupérant une page à partir d'une URL externe ...
 OrEnterPageInfoManually=Ou créez une page à partir de rien ou à partir d'un modèle de page ...
 FetchAndCreate=Récupérer et Créer
-ExportSite=Site d'exportation
+ExportSite=Exporter site
 ImportSite=Importer modèle de site web
 IDOfPage=Id de page
 Banner=Bandeau
 BlogPost=Article de Blog
-WebsiteAccount=Compte de site Web
-WebsiteAccounts=Comptes de site web
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Créer un compte sur le site web
 BackToListOfThirdParty=Retour à la liste pour le Tiers
 DisableSiteFirst=Désactiver le site Web d'abord
 MyContainerTitle=Titre de mon site web
-AnotherContainer=Un autre conteneur
+AnotherContainer=Un autre container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes du site Web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login/pass) pour chaque site / tiers
 YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut
-OnlyEditionOfSourceForGrabbedContentFuture=Avertissement: La création d'une page Web en important une page Web externe est réservée à un utilisateur expérimenté. Selon la complexité de la page source, le résultat de l'importation peut différer une fois importé de l'original. De même, si la page source utilise un style CSS commun ou un code JavaScript non compatible, cela peut casser l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide d’avoir une page, mais il est recommandé de créer votre nouvelle page à partir de rien ou à partir d’un modèle de page suggéré. <br> Notez également que seule l’édition de la source HTML sera possible lorsqu’un contenu de page aura été initialisé par une capture. à partir d'une page externe (l'éditeur "en ligne" ne sera PAS disponible)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Seule l'édition de source HTML est possible lorsque le contenu a été aspiré depuis un site externe
 GrabImagesInto=Aspirer aussi les images trouvées dans les css et la page.
 ImagesShouldBeSavedInto=Les images doivent être sauvegardées dans le répertoire
@@ -91,5 +91,5 @@ ExternalURLMustStartWithHttp=l'URL externe doit commencer par http:// ou https:/
 ZipOfWebsitePackageToImport=Fichier zip du package site Web
 ShowSubcontainers=Inclure contenu dynamique
 InternalURLOfPage=URL interne de la page
-ThisPageIsTranslationOf=Cette page / conteneur est la traduction de
-ThisPageHasTranslationPages=Cette page / conteneur a traduction
+ThisPageIsTranslationOf=Cette page / container est la traduction de
+ThisPageHasTranslationPages=Cette page / container a une traduction
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index a7ccbfca978..661a8e43b2a 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=התכונה זמינה ב דמו
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="%s">מודולים המאפשרים</a> מוצגים.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi מודולים כלים
 ModuleFamilyExperimental=הניסוי מודולים
 ModuleFamilyFinancial=מודולים פיננסיים (חשבונאות / משרד האוצר)
 ModuleFamilyECM=ניהול תוכן אלקטרוני (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=תפריט מטפלים
 MenuAdmin=תפריט העורך
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=חברות ניהול של איש הקשר
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=מסחרי
 Module2Desc=מסחרי וניהול
 Module10Name=חשבונאות
@@ -501,7 +501,7 @@ Module23Desc=מעקב אחר צריכת האנרגיה
 Module25Name=הזמנות של לקוחות
 Module25Desc=כדי לקוחות של ההנהלה
 Module30Name=חשבוניות
-Module30Desc=חשבוניות וניהול הערת אשראי ללקוחות. חשבונית של ניהול ספקים
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=ספקים
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=שיעורי מע&quot;מ או מכירות שיעורי מס
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=תנאי תשלום
 DictionaryPaymentModes=תשלום מצבי
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=נייר פורמטים
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=לייבל שימוש כברירת מחדל אם לא התרגום ניתן למצוא את קוד
 LabelOnDocuments=התווית על מסמכים
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=בסוף החודש
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=ביקורת אבטחה אירועים
-Audit=ביקורת
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=רשימת אירועים Dolibarr הביטחון
 SecurityEventsPurged=אירועים ביטחוניים מטוהר
-LogEventDesc=ניתן להפעיל כאן בכניסה לאירועים Dolibarr הביטחון. מנהלים יכולים לראות את התוכן שלה באמצעות <b>כלי מערכת</b> התפריטים <b>- הביקורת.</b> אזהרה, תכונה זו יכולה לצרוך כמות גדולה של נתונים במסד נתונים.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנסת למצב קריאה בלבד ונראה לעין עבור מנהלי בלבד.
 SystemAreaForAdminOnly=אזור זה זמין עבור המשתמשים מנהל בלבד. אף אחד הרשאות Dolibarr יכול להפחית את המגבלה.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=יחידת מחיר נטו של המוצר
 TotalPriceAfterRounding=המחיר הכולל (נטו / מע&quot;מ / מס כולל) לאחר עיגול
 ParameterActiveForNextInputOnly=פרמטר יעיל הקלט הבא רק
-NoEventOrNoAuditSetup=בשום מקרה לא ביטחון נרשמה עד כה. זה יכול להיות נורמלי אם הביקורת לא הופעל &quot;הגדרת - ביטחון - ביקורת&quot; הדף.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=ראה הגדרת sendmail המקומי
 BackupDesc=כדי לבצע גיבוי מלא של Dolibarr, עליך:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=רוכסן
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 1d42581c344..37a1d03a2d3 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index cb7c931197b..944674a4b19 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=כתב זכויות
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=תנאי תשלום
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=אחר
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index daefd4c4ba6..a36226afc93 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=נקודת מכירות
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang
index 3aa0aaa392c..190d9129653 100644
--- a/htdocs/langs/he_IL/commercial.lang
+++ b/htdocs/langs/he_IL/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/he_IL/dict.lang b/htdocs/langs/he_IL/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/he_IL/dict.lang
+++ b/htdocs/langs/he_IL/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index 76271d76df0..62d76a0b7cf 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=מדריך
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/he_IL/help.lang b/htdocs/langs/he_IL/help.lang
index 9ab2d217246..4a0b9599d4b 100644
--- a/htdocs/langs/he_IL/help.lang
+++ b/htdocs/langs/he_IL/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=מסחרי
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index 6a8e6755f7a..29036c97537 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=תאור
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index 6dd5dc98053..426dabbce4d 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=הנהג סוג
 Server=שרת
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=שם מסד הנתונים
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=שדרוג
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index cae1a09ac08..4a3bb88c2d7 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 319799b9c15..5e993be5133 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=תאור
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/he_IL/paybox.lang b/htdocs/langs/he_IL/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/he_IL/paybox.lang
+++ b/htdocs/langs/he_IL/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang
index 8810e211c2f..5028c3bff75 100644
--- a/htdocs/langs/he_IL/propal.lang
+++ b/htdocs/langs/he_IL/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index a7493d95e88..0f9c332728f 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Mogućnost onemogućena u demo verziji
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Nađi vanjske aplikacije/module
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Alati multi modula
 ModuleFamilyExperimental=Experimentalni moduli
 ModuleFamilyFinancial=Financijski moduli (Računovodstvo/Financije)
 ModuleFamilyECM=Elektronski upravitelj sadržajem (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Nosioci izbornka
 MenuAdmin=Uređivač izbornika
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Korisnici & Grupe
 Module0Desc=Upravljanje korisnicima/zaposlenicima i grupama
 Module1Name=Treće osobe
-Module1Desc=Upravljanje tvrtkama i kontaktima (kupci, potencijalni kupci, ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Trgovina
 Module2Desc=Upravljanje komercijalom
 Module10Name=Računovodstvo
@@ -501,7 +501,7 @@ Module23Desc=Praćenje potrošnje energije
 Module25Name=Narudžbe kupaca
 Module25Desc=Upravljanje narudžbama kupaca
 Module30Name=Računi
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dobavljači
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Stope PDV-a ili stope prodajnih poreza
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Rok plaćanja
 DictionaryPaymentModes=Načini plaćanja
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formati papira
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Oznake korištene kao zadane ako ne postoji prijevoda za kod
 LabelOnDocuments=Oznake na dokumentima
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Na kraju mjeseca
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Pregled sigurnosnih događaja
-Audit=Revizija
+Audit=Security events
 InfoDolibarr=O Dolibarr instalaciji
 InfoBrowser=O pregledniku
 InfoOS=O OS-u
@@ -1065,7 +1066,7 @@ BrowserName=Naziv preglednika
 BrowserOS=OS preglednika
 ListOfSecurityEvents=Popis Dolibarr sigurnosnih događaja
 SecurityEventsPurged=Sigurnosni događaji trajno obrisani
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Neto jedinična cijena proizvoda
 TotalPriceAfterRounding=Ukupna cijena (neto/PDV/uklj. porez) nakon zaokruživanja
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Provjerite vaše postavke lokalnog sendmail-a
 BackupDesc=Za kreiranje kompletnog backupa, morate:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Dodatni atributi (stavke narudžbe)
 ExtraFieldsSupplierInvoicesLines=Dodatni atributi (stavke računa)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Dodatni atributi (član)
 ExtraFieldsMemberType=Dodatni atributi (tip člana)
 ExtraFieldsCustomerInvoices=Dodatni atributi (računi)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Popis obavijesti po korisniku *
 ListOfNotificationsPerUserOrContact=Popis obavijesti po korisniku* ili po kontaktu **
 ListOfFixedNotifications=Popis stalnih obavijesti
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Najviše dopušteno
 BackupDumpWizard=Čarobnjak za izradu backup-a baze podataka
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=PBR
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index e82084d9122..4b3ee46de97 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -7,13 +7,13 @@ BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Bankovni račun
 BankAccounts=Bankovni računi
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Financijski račun ref.
 AccountLabel=Oznaka financijskog računa
 CashAccount=Gotovinski račun
 CashAccounts=Gotovinski računi
-CurrentAccounts=Trenutni računi
+CurrentAccounts=Tekući računi
 SavingAccounts=Štedni računi
 ErrorBankLabelAlreadyExists=Oznaka financijskog računa već postoji
 BankBalance=Stanje računa
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Adresa računa
 BankAccountCountry=Država računa
 BankAccountOwner=Naziv vlasnika računa
 BankAccountOwnerAddress=Adresa vlasinka računa
-RIBControlError=Neispravne vrijednosti. Ovo znači da informacije za ovaj račun nisu potpune ili su krive ( provjerite državu, brojeve i IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi financijski račun
@@ -55,7 +55,7 @@ EditFinancialAccount=Uredi račun
 LabelBankCashAccount=Oznaka za banku ili gotovinu
 AccountType=Tip računa
 BankType0=Štedni račun
-BankType1=Trenutni ili račun kreditne kartice
+BankType1=Tekući račun ili kreditna kartica
 BankType2=Gotovinski račun
 AccountsArea=Sučelje računa
 AccountCard=Kartica računa
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Može se uskladiti
 Conciliate=Uskladi
 Conciliation=Usklađivanje
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Uključujući i zatvorene račune
 OnlyOpenedAccount=Samo otvoreni računi
@@ -104,7 +105,7 @@ SocialContributionPayment=Plaćanje društveni/fiskalni porez
 BankTransfer=Bankovni transfer
 BankTransfers=Bankovni transferi
 MenuBankInternalTransfer=Interni prijenos
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prijenos sa <b>%s</b> na <b>%s</b> od <b>%s</b> %s je pohranjen.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni čekovi
 BankChecksToReceipt=Čekovi koji čekaju depozit
 ShowCheckReceipt=Prikaži potvrdu depozita čeka
-NumberOfCheques=Br čekova
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Povratak na račun
 ShowAllAccounts=Prikaži za sve račune
-FutureTransaction=Transakcija je u budućnosti. Ne može se uskladiti.
-SelectChequeTransactionAndGenerate=Odaberite/filtrirajte čekove koje želite uključiti, odaberite potvrdu depozita i kliknite "Kreiraj"
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Odaberite bankovni izvod povezan s usklađenjem. Koristite numeričke vrijednosti: YYYYMM ili YYYYMMDD radi sortiranja
 EventualyAddCategory=Konačno, odredite kategoriju u koju želite svrstati podatke
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Datum povratka čeka
 CheckRejected=Ček vračen
 CheckRejectedAndInvoicesReopened=Ček je vračen i računi su ponovo otvoreni
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 1643e97e380..f3310b08fd8 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Račun
+Bill=Račun R1
 Bills=Računi
-BillsCustomers=Računi za kupce
-BillsCustomer=Račun za kupca
-BillsSuppliers=Račun dobavljača
-BillsCustomersUnpaid=Neplaćeni računi kupca
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomers=Računi kupaca
+BillsCustomer=Račun kupca
+BillsSuppliers=Računi dobavljača
+BillsCustomersUnpaid=Neplaćeni računi kupaca
+BillsCustomersUnpaidForCompany=Neplaćeni računi kupaca za %s
 BillsSuppliersUnpaid=Neplaćeni računi dobavljača
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Neplaćeni računi dobavljača za %s
 BillsLate=Zakašnjela plaćanja
 BillsStatistics=Statistika računa kupaca
 BillsStatisticsSuppliers=Statistika računa dobavljača
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Onemogućeno jer ne može biti obrisano
+DisabledBecauseDispatchedInBookkeeping=Nije moguće provesti jer je račun poslan u knjigovodstvo
+DisabledBecauseNotLastInvoice=Nije moguće provesti jer se račun ne može izbrisati. U međuvremenu su ispostavljeni novi računi i tako bi neki brojevi ostali preskočeni.
+DisabledBecauseNotErasable=Nije moguće provesti jer ne može biti obrisano
 InvoiceStandard=Običan račun
 InvoiceStandardAsk=Običan račun
 InvoiceStandardDesc=Ovo je uobičajeni tip računa.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
-InvoiceProForma=Predračun
-InvoiceProFormaAsk=Predračun
-InvoiceProFormaDesc=<b> Predračun </ b> je kopija pravog računa, ali nema knjigovodstvene vrijednosti.
+InvoiceDeposit=Račun za predujam
+InvoiceDepositAsk=Račun za predujam
+InvoiceDepositDesc=Ovakav račun izdaje se kada je zaprimljen predujam
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Zamjenski račun
 InvoiceReplacementAsk=Zamjenski račun za račun
-InvoiceReplacementDesc=<b>Zamjenski račun</b>koristi se za opozivanje i zamjenu postojećeg računa koji još nije plaćen. <br><br>Bilješka: Mogu biti zamijenjeni samo računi uz koje nije vezano nikakvo plaćanje. Ako račun kojeg mijenjate nije još zatvoren, bit će samostalno zatvoren kao "napušten".
-InvoiceAvoir=Odobrenje
-InvoiceAvoirAsk=Odobrenje za ispravak računa
-InvoiceAvoirDesc=<b>kredit<b> je negativan račun koji se koristi prilikom riješavanja problema koji nastaje kada je na računu drugačiji iznos od plaćenog (npr. kada je kupac uplatio više greškom ili neće platiti sve jer je jedan dio proizvoda vratio).
-invoiceAvoirWithLines=Kreiranje odobrenja  sa stavkama po izvornom računu
-invoiceAvoirWithPaymentRestAmount=Kreiranje odobrenja s neplačenim iznosom po izvornom računu
-invoiceAvoirLineWithPaymentRestAmount=Financijsko odobrenje za neplaćeni iznos
-ReplaceInvoice=Zamjeni račun %s
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Knjižno odobrenje
+InvoiceAvoirAsk=Knjižno odobrenje za ispravak računa
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
+invoiceAvoirWithLines=Izradi knjižno odobrenje sa stavkama iz izvornog računa
+invoiceAvoirWithPaymentRestAmount=Izradi knjižno odobrenje s preostalim neplaćenim iznosom iz izvornog računa
+invoiceAvoirLineWithPaymentRestAmount=Knjižno odobrenje za preostali neplaćeni iznos
+ReplaceInvoice=Zamijeni račun %s
 ReplacementInvoice=Zamjenski račun
 ReplacedByInvoice=Zamijenjen s računom %s
 ReplacementByInvoice=Zamijenjen računom
 CorrectInvoice=Ispravi račun %s
 CorrectionInvoice=Ispravljeni račun
-UsedByInvoice=Korišteno za plaćanje računa %s
+UsedByInvoice=Iskorišteno za plaćanje računa %s
 ConsumedBy=Potrošio
 NotConsumed=Nije potrošio
 NoReplacableInvoice=Nema zamjenjivih računa
 NoInvoiceToCorrect=Nema računa za ispravak
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Bio je izvor od jednog ili više knjižnih odobrenja
 CardBill=Kartica računa
 PredefinedInvoices=Predlošci računa
-Invoice=Račun
-PdfInvoiceTitle=Račun
+Invoice=Račun R1
+PdfInvoiceTitle=Račun R1
 Invoices=Računi
-InvoiceLine=Popis računa
+InvoiceLine=Redak računa
 InvoiceCustomer=Račun za kupca
 CustomerInvoice=Račun za kupca
 CustomersInvoices=Računi za kupce
@@ -58,50 +58,50 @@ SuppliersInvoices=Računi dobavljača
 SupplierBill=Račun dobavljača
 SupplierBills=Računi dobavljača
 Payment=Plaćanja
-PaymentBack=Povratno plaćanje
-CustomerInvoicePaymentBack=Povrat plaćanja
+PaymentBack=Isplata
+CustomerInvoicePaymentBack=Isplata
 Payments=Plaćanja
-PaymentsBack=Povratna plaćanja
-paymentInInvoiceCurrency=po valuti računa
+PaymentsBack=Isplate
+paymentInInvoiceCurrency=u valuti računa
 PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
-SupplierPayments=Plaćanja dobavljačima
+ConfirmDeletePayment=Sigurno želite izbrisati ovo plaćanje?
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+SupplierPayments=Uplate dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
-PayedSuppliersPayments=Uplata uplaćena dobavljačima
-ReceivedCustomersPaymentsToValid=Primljene uplate kupaca za ovjeru
+PayedSuppliersPayments=Payments paid to suppliers
+ReceivedCustomersPaymentsToValid=Uplate kupaca za ovjeru
 PaymentsReportsForYear=Izvještaji plaćanja za %s
 PaymentsReports=Izvještaji plaćanja
 PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Izvršeni povrati plaćanja
-PaymentRule=Pravilo plaćanja
-PaymentMode=Oblik plaćanja
-PaymentTypeDC=Debit/Credit Card
+PaymentRule=Način plaćanja
+PaymentMode=Način plaćanja
+PaymentTypeDC=Debitna/kreditna kartica
 PaymentTypePP=PayPal
-IdPaymentMode=Oblik plaćanja (ID)
-CodePaymentMode=Payment type (code)
-LabelPaymentMode=Oblik plaćanja (oznaka)
-PaymentModeShort=Oblik plaćanja
-PaymentTerm=Uvjeti plaćanja
-PaymentConditions=Uvjeti plaćanja
-PaymentConditionsShort=Uvjeti plaćanja
+IdPaymentMode=Način plaćanja (oznaka)
+CodePaymentMode=Način plaćanja (kod)
+LabelPaymentMode=Način plaćanja (natpis)
+PaymentModeShort=Način plaćanja
+PaymentTerm=Rok plaćanja
+PaymentConditions=Rok plaćanja
+PaymentConditionsShort=Rok plaćanja
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Ovjeri plaćanje
-PaymentHigherThanReminderToPay=Plaćanje je veće nego podsjetnik za plaćanje
-HelpPaymentHigherThanReminderToPay=Pažnja, iznos plaćanja jednog ili više računa je veći nego ostatak plaćanja. <br> Promjenite Vaš unos, u suprotnom potvrdite i razmislite o kreiranju odborenja za primljeni višak za svaki pretplaćeni račun.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+PaymentHigherThanReminderToPay=Iznos plaćanja veći je od iznosa po podsjetniku na plaćanje
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao plaćeno
 ClassifyPaidPartially=Označi kao djelomično plaćeno
 ClassifyCanceled=Označi kao napušteno
 ClassifyClosed=Označi kao zatvoreno
-ClassifyUnBilled=Klasificirati 'nefakturirano'
+ClassifyUnBilled=Označi kao "nezaračunato"
 CreateBill=Izradi račun
-CreateCreditNote=Izradi zadužnicu
-AddBill=Izradi račun ili kreditnu bilješku
-AddToDraftInvoices=Dodati u skice računa
+CreateCreditNote=Create credit note
+AddBill=Izradi račun ili knjižno odobrenje
+AddToDraftInvoices=Dodati u predložak računa
 DeleteBill=Izbriši račun
 SearchACustomerInvoice=Traži račun za kupca
 SearchASupplierInvoice=Traži račun dobavljača
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zatvoreno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (djelomično)
 BillShortStatusDraft=Skica
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Napušteno
 BillShortStatusValidated=Ovjereno
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zatvoreno
 BillShortStatusClosedPaidPartially=Plaćeno (djelomično)
 PaymentStatusToValidShort=Za ovjeru
-ErrorVATIntraNotConfigured=OIB nije upisan
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Osnovni oblik plaćanja nije dodijeljen. Kako biste to ispravili otvorite postavke, mapa računi.
 ErrorCreateBankAccount=Izradite bankovni račun i nakon toga podesite oblik plaćanja u postavkama, mapa računi.
 ErrorBillNotFound=Račun %s ne postoji
-ErrorInvoiceAlreadyReplaced=Greška! Pokušali ste ovjeriti račun koji mijenja račun %s, a taj račun je već zamijenjen računom %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Greška! Popust je već iskorišten.
 ErrorInvoiceAvoirMustBeNegative=Greška! Ispravan račun treba imati negativan iznos.
 ErrorInvoiceOfThisTypeMustBePositive=Greška! Ovaj tip računa mora imati pozitivan iznos
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne može se poništiti račun koji je zamijenjen drugim računom koji je otvoren kao skica.
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Radnje na računu
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Reguliramo PDV putem odobrenja.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Prihvaćam gubitak iznos PDV-a na ovom popustu.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Potražujem povrat poreza na popustu bez odobrenja.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako vaš račun je izdan s prikladnom napomenom. (Primjer «Samo porez koji odgovara cijeni koja je plaćena daje pravo na odbitak poreza»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristi ovaj izbor ako ostali nisu prikladni, npr. u sljedećoj situaciji: <br> - uplata nije kompletna jer neki od proizvoda s vraćeni nazad <br> - iznos potraživanja je prevažan jer je izostavljen popust <br> U svim slučajevima, iznos prekoračenja mora biti ispravljen u računovodstvu kreiranjem odobrenja.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Drugo
 ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor će biti korišten u svim ostalim slućajevima. Na primjer zato jer planirate kreirati zamjenski račun.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,10 +201,11 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Ovjeri račun
 UnvalidateBill=Neovjeren račun
-NumberOfBills=Broj računa
+NumberOfBills=No. of invoices
 NumberOfBillsByMonth=Broj računa po mjesecu
 AmountOfBills=Broj računa
-AmountOfBillsByMonthHT=Broj računa po mjesecu (bez PDV-a)
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Iznos računa po mjesecu (bez PDV-a)
 ShowSocialContribution=Prikaži društveni/fiskalni porez
 ShowBill=Prikaži račun
 ShowInvoice=Prikaži račun
@@ -216,7 +218,7 @@ AlreadyPaid=Plaćeno do sada
 AlreadyPaidBack=Povrati do sada
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Napušteno
-RemainderToPay=Preostali neplaćeni iznos
+RemainderToPay=Preostalo za platiti
 RemainderToTake=Preostali iznos za primiti
 RemainderToPayBack=Remaining amount to refund
 Rest=U toku
@@ -246,12 +248,12 @@ DatePointOfTax=Porezna stavka
 NoInvoice=Nema računa
 ClassifyBill=Svrstavanje računa
 SupplierBillsToPay=Neplaćeni računi dobavljača
-CustomerBillsUnpaid=Neplaćeni računi kupca
+CustomerBillsUnpaid=Neplaćeni računi kupaca
 NonPercuRecuperable=Nepovratno
 SetConditions=Odredi rok plaćanja
 SetMode=Odredi oblik plaćanja
 SetRevenuStamp=Postavi prihodovnu markicu
-Billed=Nplaćeno
+Billed=Zaračunato
 RecurringInvoices=Pretplatnički računi
 RepeatableInvoice=Predložak računa
 RepeatableInvoices=Predlošci računa
@@ -260,15 +262,15 @@ Repeatables=Predlošci
 ChangeIntoRepeatableInvoice=Pretvori u predložak računa
 CreateRepeatableInvoice=Izradi predložak računa
 CreateFromRepeatableInvoice=Izradi iz predloška računa
-CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Računi i plaćanja kupca
-ExportDataset_invoice_1=Računi kupca i popis računa
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Računi i plaćanja kupca
 ProformaBill=Predračun:
 Reduction=Smanjivanje
-ReductionShort=Smanjivanje
+ReductionShort=Popust
 Reductions=Smanjivanja
-ReductionsShort=Smanjivanje
+ReductionsShort=Popust
 Discounts=Popusti
 AddDiscount=Izradi popust
 AddRelativeDiscount=Izradi relativan popust
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Adresa za naplatu
-HelpEscompte=Ovaj popust zajamčen je jer je kupac izvršio plaćanje prije roka.
-HelpAbandonBadCustomer=Ovaj iznos neće biti plaćen (kupac je loš kupac) i smatra se kao gubitak.
-HelpAbandonOther=Ovaj iznos neće biti plaćen zbog greške (na primjer odabran je krivi kupac ili je račun zamjenjen drugim računom)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=ID plaćanja društvenog/fiskalnog poreza
 PaymentId=Oznaka plaćanja
 PaymentRef=Ref. plaćanja
@@ -321,22 +323,22 @@ InvoiceNotChecked=Račun nije izabran
 CloneInvoice=Kloniraj račun
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Radnja obustavljena jer je račun zamjenjen.
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Broj plaćanja
+DescTaxAndDividendsArea=Ovo sučelje predstavlja sažetak svih plaćanja za specijalne troškove. Uključeni su samo podaci s plaćanjem u tekućoj godini.
+NbOfPayments=No. of payments
 SplitDiscount=Podijeli popust u dva
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Unesite iznos za svaku od oba dijela:
-TotalOfTwoDiscountMustEqualsOriginal=Ukupan zbroj dva nova rabata mora biti jednak kao originalni iznos rabata.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
-RelatedCustomerInvoices=Povezani računi kupca
+RelatedCustomerInvoices=Povezani računi kupaca
 RelatedSupplierInvoices=Povezani računi dobavljača
 LatestRelatedBill=Posljednju vezani računi
-WarningBillExist=Upozorenje, jedan ili više računa već postoje
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Alat za spajanje PDF dokumenta
 AmountPaymentDistributedOnInvoice=Plaćeni iznos je prosljeđen po računu
-PaymentOnDifferentThirdBills=Dopusti plaćanja za različite račune, ali od iste matične tvrtke
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Obavijest plaćanja
 ListOfPreviousSituationInvoices=Popis prijašnjih računa etape
 ListOfNextSituationInvoices=Popis narednih računa etapa
@@ -368,8 +370,8 @@ WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from curre
 ViewAvailableGlobalDiscounts=View available discounts
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Dospijeće po primitku
+PaymentConditionRECEP=Dospijeće po primitku
 PaymentConditionShort30D=30 dana
 PaymentCondition30D=30 dana
 PaymentConditionShort30DENDMONTH=30 dana na kraju mjeseca
@@ -380,7 +382,7 @@ PaymentConditionShort60DENDMONTH=60 dana na kraju mjeseca
 PaymentCondition60DENDMONTH=Unutar 60 dana od kraja mjeseca
 PaymentConditionShortPT_DELIVERY=Isporuka
 PaymentConditionPT_DELIVERY=Po primitku
-PaymentConditionShortPT_ORDER=Narudžba
+PaymentConditionShortPT_ORDER=Narudžbenica
 PaymentConditionPT_ORDER=Po nalogu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% nakon isporuke
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
 PaymentTypeTIP=TIP (Dokumenti uz plaćanje) 
 PaymentTypeShortTIP=TIP Plaćanje
-PaymentTypeVAD=Internet plaćanje
-PaymentTypeShortVAD=Internet plaćanje
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Skica banke
 PaymentTypeShortTRA=Skica
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Bankovni podaci
 BankCode=Oznaka Banke
-DeskCode=Desk code
-BankAccountNumber=Broj računa
-BankAccountNumberKey=Ključ
+DeskCode=Office code
+BankAccountNumber=IBAN
+BankAccountNumberKey=Check digits
 Residence=Izravno zaduženje
-IBANNumber=IBAN broj
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT broj
@@ -441,11 +443,11 @@ IntracommunityVATNumber=Porezni broj
 PaymentByChequeOrderedTo=Plačanja čekom (uključujući porez) su naplativi prema %s poslani 
 PaymentByChequeOrderedToShort=Plačanja čekom (uključujući porez) su naplativi prema 
 SendTo=Pošalji
-PaymentByTransferOnThisBankAccount=Bezgotovinsko plaćanje na slijedeći bankovni račun
+PaymentByTransferOnThisBankAccount=Bezgotovinsko plaćanje na sljedeći bankovni račun
 VATIsNotUsedForInvoice=Ne primjenjivo VAT čl.-293B CGI-a
 LawApplicationPart1=Po primjeni zakona 80.335 od 12.05.80
 LawApplicationPart2=Roba ostaje vlasništvo
-LawApplicationPart3=prodavača sve do izvršenja cjelokupnog plaćanja
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=njihove cijene.
 LimitedLiabilityCompanyCapital=SARL s kapitalom od
 UseLine=Primjeni
@@ -463,7 +465,7 @@ Cheques=Čekovi
 DepositId=ID depozita
 NbCheque=Broj čekova
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Koristi adresu naplate kupca umjesto adrese komitenta kao primatelja računa
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Prikaži sve neplaćene račune
 ShowUnpaidLateOnly=Prikaži samo račune kojima kasni plaćanje
 PaymentInvoiceRef=Plaćanje računa %s
@@ -474,21 +476,22 @@ Reported=Odgođeno
 DisabledBecausePayments=Nije moguće obzirom da postoje neka plaćanja
 CantRemovePaymentWithOneInvoicePaid=Plaćanje se ne može izbrisati obzirom da postoji barem jedan račun koji je označen kao plaćen
 ExpectedToPay=Očekivano plaćanje
-CantRemoveConciliatedPayment=Nije moguče uklanjanje usaglašenog plaćanja
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plaćeno s ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Klasificiraj "plaćene" bonifikacije kao plaćene u cjelosti.
-ClosePaidContributionsAutomatically=Označi "Plaćeno" sve društvene ili fiskalne kompletno plaćene doprinose.
-AllCompletelyPayedInvoiceWillBeClosed=Svi računi za plačanje bez ostatka biti će automatski zatvoreni s statusom "Plaćeno"
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Plati
 ToMakePaymentBack=Povrat
 ListOfYourUnpaidInvoices=Popis neplaćenih računa
 NoteListOfYourUnpaidInvoices=Napomena: Ovaj popis sadrži samo račune za komitente kojima ste vi prodajni predstavnik
 RevenueStamp=Prihodovna markica
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Kako biste izradili novi predložak računa morate prvo izraditi običan račun i onda ga promijeniti u "predložak"
 PDFCrabeDescription="Crabe" predložak PDF računa. Potpuni predložak računa (preporučeni)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF račun prema Crevette predlošku. Kompletan predložak računa za etape
 TerreNumRefModelDesc1=Vraća broj u formatu %syymm-nnnn za standardne račune i %syymm-nnnn za odobrenja gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Napredak stavke računa ne može biti veći od ili  jed
 updatePriceNextInvoiceErrorUpdateline=Greška: promjena cijene na stavki računa: %s
 ToCreateARecurringInvoice=Za kreiranje ponavljajućih računa za ovaj ugovor, prvo kreirajte skicu računa, onda konvertirajte istu u predložak računa i definirajte učestalost generiranja budućih računa.
 ToCreateARecurringInvoiceGene=Za generiranje budućih računa normalno ili ručno, idite na izbornik <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Ako trebate imati takve račune automatski generirane, zatražite od vašeg administratora da uključi modul <strong>%s</strong>. Napomena: oba načina (ručni i automatski) mogu se koristit zajedno bez rizika od dupliciranja. 
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Izbriši predložak računa
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Račun obrisan
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index f6e639aa9f0..85c430beb54 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -9,7 +9,7 @@ CashdeskShowServices=Prodaja usluga
 CashDeskProducts=Proizvodi
 CashDeskStock=Zaliha
 CashDeskOn=na
-CashDeskThirdParty=Komitent
+CashDeskThirdParty=Treća osoba
 ShoppingCart=Košarica
 NewSell=Nova prodaja
 AddThisArticle=Dodaj ovu stavku
@@ -30,5 +30,15 @@ ShowCompany=Prikaži tvrtku
 ShowStock=Prikaži skladište
 DeleteArticle=Kliknite za brisanje stavke
 FilterRefOrLabelOrBC=Pretraživanje (Ref/Oznaka)
-UserNeedPermissionToEditStockToUsePos=Možete zatražiti da smanjite zalihe po kreiranju računa, tako da korisnik koji koristi POS ima dozvolu za uređivanje zaliha.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Pisač za ispis računa
+PointOfSale=POS
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index 476106662da..a6dffff41bb 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonski poziv
 ActionAC_FAX=Pošalji faks
 ActionAC_PROP=Pošalji ponudu poštom
 ActionAC_EMAIL=Pošalji e-poštu
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Sastanci
 ActionAC_INT=Intervencija na lokaciji
 ActionAC_FAC=Pošalji račun kupca poštom
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 9176b9d6c2d..2ff560a0ba1 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Računi | Plaćanja
 TaxModuleSetupToModifyRules=Idite na <a href="%s">Podešavanje modula poreza</a> za promjenu pravila izračuna
 TaxModuleSetupToModifyRulesLT=Idite na <a href="%s">Postavke tvrtke</a> za promjenu pravila za kalkulacije
 OptionMode=Opcija za računovodstvo
@@ -78,7 +78,7 @@ MenuNewSocialContribution=Novi druš/fis porez
 NewSocialContribution=Novi društveni/fiskalni porez
 AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Društvni/fiskalni porez za platiti
-AccountancyTreasuryArea=Billing and payment area
+AccountancyTreasuryArea=Sučelje računa i plaćanja
 NewPayment=Novo plaćanje
 Payments=Plaćanja
 PaymentCustomerInvoice=Uplata računa kupca
@@ -86,7 +86,7 @@ PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Plaćanje društveni/fiskalni porez
 PaymentVat=PDV plaćanje
 ListPayment=Popis plaćanja
-ListOfCustomerPayments=Popis uplata kupca
+ListOfCustomerPayments=Popis uplata kupaca
 ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Datum početka perioda
 DateEndPeriod=Datum završetka perioda
@@ -122,7 +122,7 @@ Turnover=Turnover invoiced
 TurnoverCollected=Turnover collected
 SalesTurnoverMinimum=Minimum turnover
 ByExpenseIncome=Po troškovima i prihodima
-ByThirdParties=Po komitentima
+ByThirdParties=Po trećim osobama
 ByUserAuthorOfInvoice=Po autoru računa
 CheckReceipt=Depozit čeka
 CheckReceiptShort=Depozit čeka
@@ -132,7 +132,7 @@ NewCheckDeposit=Novi depozit čeka
 NewCheckDepositOn=Izradi račun za depozit na računu: %s
 NoWaitingChecks=Nema čekova koji čekaju depozit.
 DateChequeReceived=Datum zaprimanja čeka
-NbOfCheques=Br. čekova
+NbOfCheques=No. of checks
 PaySocialContribution=Plati društveni/fiskalni porez
 ConfirmPaySocialContribution=Jeste li sigurni da želite svrstati ovaj društveni/fiskalni porez kao plaćeno ?
 DeleteSocialContribution=Obriši plaćanje društvenog ili fiskalnog poreza
@@ -142,7 +142,7 @@ CalcModeVATDebt=Način <b>%sPDV na računovodstvene usluge%s</b>
 CalcModeVATEngagement=Način <b>%sPDV na prihode-troškove%s</b>
 CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of <b>data journalized in Bookkeeping Ledger table</b>
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Način <b>%sRE na računima kupaca - računima dobavljača%s</b>
 CalcModeLT1Debt=Način  <b>%sRE na računu kupca%s</b>
 CalcModeLT1Rec= Način  <b>%sRE na računu dobavljača%s</b>
@@ -167,7 +167,7 @@ RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accou
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
@@ -205,7 +205,7 @@ SellsJournal=Izvještaj prodaje
 PurchasesJournal=Izvještaj kupovine
 DescSellsJournal=Izvještaj prodaje
 DescPurchasesJournal=Izvještaj kupovine
-InvoiceRef=Ref. računa
+InvoiceRef=Broj računa
 CodeNotDef=Nije definirano
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Datum valute plaćanja ne može biti manji od datuma objekta.
@@ -229,11 +229,11 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accounting account on third party is not defined.
 CloneTax=Kloniraj društveni/fiskalni porez
-ConfirmCloneTax=Potvrdi kloniranje plaćanja društvenog/fiskalnog poreza
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
 CloneTaxForNextMonth=Kloniraj za sljedeći mjesec
 SimpleReport=Jednostavan izvještaj
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -248,7 +248,7 @@ ErrorBankAccountNotFound=Greška: Nije pronađen bankovni račun
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignement
+AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
index c2e43af033a..76455f4137f 100644
--- a/htdocs/langs/hr_HR/dict.lang
+++ b/htdocs/langs/hr_HR/dict.lang
@@ -76,7 +76,7 @@ CountryCG=Kongo
 CountryCD=Kongo, demokratska republika
 CountryCK=Cook Islands
 CountryCR=Kostarika
-CountryHR=Hrvatska!
+CountryHR=Hrvatska
 CountryCU=Kuba
 CountryCY=Cipar
 CountryCZ=Češka
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Island
+CountryIS=Iceland
 CountryIN=Indija
 CountryID=Indonezija
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Sjeverna Korea
 CountryKR=Južna Korea
 CountryKW=Kuvajt
-CountryKG=Kirgistan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvija
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavija
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambik
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Nambija
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad i Tobago
 CountryTR=Turska
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -255,14 +255,14 @@ CivilityMLE=Gđica.
 CivilityMTRE=Master
 CivilityDR=Doktor
 ##### Currencies #####
-Currencyeuros=Eura
+Currencyeuros=Euro [EUR]
 CurrencyAUD=AU Dolara
 CurrencySingAUD=AU Dolar
 CurrencyCAD=CAN Dolara
 CurrencySingCAD=CAN dolar
 CurrencyCHF=Švic. franaka
 CurrencySingCHF=Švic. Franaka
-CurrencyEUR=Eura
+CurrencyEUR=Euro [EUR]
 CurrencySingEUR=Euro
 CurrencyFRF=Fran. Franaka
 CurrencySingFRF=Fran. Franaka
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norveških Kruna
-CurrencySingNOK=Norveška Kruna
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuniških Dinara
 CurrencySingTND=Tuniški Dinar
 CurrencyUSD=SAD Dolara
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Usmeno
 DemandReasonTypeSRC_PARTNER=Suradnik
 DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
 DemandReasonTypeSRC_SPONSORING=Sponzorstvo
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=4A0 format
 PaperFormatEU2A0=2A0 format
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index 99b06a501c0..b7500f845e2 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Br. dokumenata u mapi
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Mapa
 ECMSectionManual=Ručna mapa
 ECMSectionAuto=Automatska mapa
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenti vezani za projekte
 ECMDocsByUsers=Dokumenti povezani za korisnike
 ECMDocsByInterventions=Dokumenti povezani za intervencije
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Mapa nije kreirana
 ShowECMSection=Prikaži mapu
 DeleteSection=Obriši mapu
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 98b9673e97f..d72fdb8e6ea 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hr_HR/help.lang b/htdocs/langs/hr_HR/help.lang
index 3532758cca9..25e0f10a260 100644
--- a/htdocs/langs/hr_HR/help.lang
+++ b/htdocs/langs/hr_HR/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote podrška
 OtherSupport=Ostala podrška
 ToSeeListOfAvailableRessources=Da biste kontaktirali/vidjeli raspoložive resurse:
 HelpCenter=Help centar
-DolibarrHelpCenter=Dolibarr centar pomoći i podrške
-ToGoBackToDolibarr=U suprotnom, kliknite <a href="%s">ovdje za korištenje Dolibarr-a</a>
-TypeOfSupport=Izvor podrške
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Zajednica (besplatno)
 TypeSupportCommercial=Komercijalno
 TypeOfHelp=Tip
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efikasnost
 TypeHelpOnly=Samo pomoć
 TypeHelpDev=Pomoć + Razvoj
-TypeHelpDevForm=Pomoć + Razvoj + Osnivanje
-ToGetHelpGoOnSparkAngels1=Neke tvrtke mogu pružiti brzu (ponekad neposrednu) i efikasniju online podršku uzimajući kontrolu nad vašim računalom. Takvi pomoćnici mogu se pronaći na <b>%s</b> web stranicama:
-ToGetHelpGoOnSparkAngels3=Također možete pogledati popis svih dostupnih trenera za Dolibarr, za to kliknite na gumb 
-ToGetHelpGoOnSparkAngels2=Ponekad, nema dostupne tvrtke u trenutku vašeg pretraživanja, probajte promjeniti filter za pretraživanje na "sva dostupnost". Biti ćete u mogućnosti poslati više zahtjeva.
-BackToHelpCenter=U suprotnim, kliknite ovdje za povratak na <a href="%s">naslovnu stranicu centra pomoći</a>.
-LinkToGoldMember=Možete nazvati jednog od trenera predodabrane od Dolibarr-a za vaš jezik (%s) kliknuvši na dodatak(status i maksimalna cijena je automatski ažurirana):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Podržani jezici
-SubscribeToFoundation=Pomognite Dolibarr projektu, prijavite se u zakladu
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Za oficijalnu Dolibarr podršku na vašem jeziku: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index 419b932781c..9eb3e2f84f4 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Odsustva
-CPTitreMenu=Odsustva
+HRM=Djelatnici
+Holidays=Napusti
+CPTitreMenu=Napusti
 MenuReportMonth=Mjesečna izjava
 MenuAddCP=Novi zahtjev odsustva
-NotActiveModCP=Morate omogućiti modul Odsustva za pregled ove stranice.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Izradi zahtjev odsustva
 DateDebCP=Datum početka
 DateFinCP=Datum završetka
@@ -15,13 +15,18 @@ ApprovedCP=Odobreno
 CancelCP=Poništeno
 RefuseCP=Odbijeno
 ValidatorCP=Odobrio
-ListeCP=Popis odsustva
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Kreiraj zahtjev odsustva
 DelayToRequestCP=Zahtjev odsustva mora biti kreiran najmanje <b>%s dan(a)</b> prije.
-MenuConfCP=Stanje odsustva
-SoldeCPUser=Stanje odsustva je <b>%s</b> dana.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Datum završetka mora biti veći od datuma početka.
 ErrorSQLCreateCP=Dogodila se SQL greška kod kreiranja:
 ErrorIDFicheCP=Dogosila se greška, zahtjev ne postoji.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Niste ovlašteni za čitanje zahtjeva.
 InfosWorkflowCP=Procedura Informacija
 RequestByCP=Zahtjeva
 TitreRequestCP=Zahtjev za odsustvom
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Broj potrošenih dana godišnjeg 
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Uredi
 DeleteCP=Obriši
 ActionRefuseCP=Odbij
@@ -59,6 +71,7 @@ DateRefusCP=Datum odbijanja
 DateCancelCP=Datom otkazivanja
 DefineEventUserCP=Dodjeli specijalno odsustvo za korisnika
 addEventToUserCP=Dodjeli odsustvo
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Razlog
 UserCP=Korisnik
 ErrorAddEventToUserCP=Dogodila se greška kod dodavanja specijalnog odsustva.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Zadnje automatsko ažuriranje raspodjele odlazaka
-MonthOfLastMonthlyUpdate=Mjesec zadnjeg automatskog ažuriranja raspodjele odlazaka
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Uspješno promjenjeno
 Module27130Name= Upravljanje zahtjevima odsustva
 Module27130Desc= Upravljanje zahtjevima odsustva
@@ -94,7 +112,7 @@ NoticePeriod=Otkazni rok
 HolidaysToValidate=Ovjeri zahtjeve
 HolidaysToValidateBody=Dolje su zahtjevi za ovjeru
 HolidaysToValidateDelay=Ovaj zahtjev će stupiti na snagu unutar perioda manjeg od %s dana.
-HolidaysToValidateAlertSolde=Korisnik koji je kreirao zahtjev nema dovoljno dostupnih dana.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Ovjereni zahtjevi
 HolidaysValidatedBody=Vaš zahtjev za %s do %s je ovjeren.
 HolidaysRefused=Zahtjev odbijen
@@ -103,4 +121,9 @@ HolidaysCanceled=Otkazani zahtjev
 HolidaysCanceledBody=Vaš zahtjev za %s do %s je otkazan.
 FollowedByACounter=1: Ovaj tip odsustva mora biti pračen brojačem. Brojač se povečava ručno ili automatski, a kada je zahtjev ovjeren, brojač se smanjuje.<br> 0: Nije pračeno brojačem.
 NoLeaveWithCounterDefined=Nema definiranih tipova zahtjeva koji moraju biti pračenjem brojačem
-GoIntoDictionaryHolidayTypes=Idite na <strong>Naslovnu - Podešavanje - Definicije - Tipovi odsustva</strong> za podešavanje različitih tipova odsustva.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index a4c767125a3..fc2c04eaed9 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Tip upr. programa
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Naziv baze podataka
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Neuspješno kreiranje administratorskog računa.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Nadogradnja
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migracija podataka za ponude
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Ažuriraj adresu dostave kod isporuke
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 5a540b38d6f..d4be6ef829f 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakti ove treće osobe
 ContactsAddressesForCompany=Kontakti/adrese ove treće osobe
 AddressesForCompany=Adrese ove treće osobe
 ActionsOnCompany=Događaji povezani s ovom trećom osobom
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Događaji vezani uz ovog člana
 ActionsOnProduct=Radnje vezane uz ovaj proizvod
 NActionsLate=%s kasni
@@ -847,9 +848,9 @@ ModuleBuilder=Graditelj sučelja
 SetMultiCurrencyCode=Odredi valutu
 BulkActions=Opsežne radnje
 ClickToShowHelp=Klikni za prikaz pomoći
-WebSite=Internet stranica
-WebSites=Internet stranice
-WebSiteAccounts=Korisnici Internet stranica
+WebSite=Website
+WebSites=Web lokacije
+WebSiteAccounts=Website accounts
 ExpenseReport=Izvještaj troška
 ExpenseReports=Izvještaji troška
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Potvrda masovnog brisanja skica
 FileSharedViaALink=Datoteka podijeljena putem poveznice
 SelectAThirdPartyFirst=Prvo izaberite treću osobu...
 YouAreCurrentlyInSandboxMode=Trenutno ste %s u "sandbox" načinu rada
+Inventory=Inventory
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index acd4a202693..d5f32c6267d 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Sučelje narudžba kupaca
-SuppliersOrdersArea=Purchase orders area
-OrderCard=Kartica nardžbi
+SuppliersOrdersArea=Sučelje narudžbenica
+OrderCard=Narudžbenica
 OrderId=Broj narudžbe
-Order=Narudžba
-PdfOrderTitle=Narudžba
+Order=Narudžbenica
+PdfOrderTitle=Narudžbenica
 Orders=Narudžbe
 OrderLine=Stavka narudžbe
 OrderDate=Datum narudžbe
@@ -13,18 +13,18 @@ OrderToProcess=Obrada narudžbe
 NewOrder=Nova narudžba
 ToOrder=Napravi narudžbu
 MakeOrder=Napravi narudžbu
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SuppliersOrdersRunning=Current purchase orders
+SupplierOrder=Narudžbenica
+SuppliersOrders=Narudžbenice
+SuppliersOrdersRunning=Otvorene narudžbenice
 CustomerOrder=Narudžba kupca
 CustomersOrders=Narudžbe kupaca
 CustomersOrdersRunning=Trenutne narudžbe kupaca
-CustomersOrdersAndOrdersLines=Narudžba kupca i stavke narudžbe
+CustomersOrdersAndOrdersLines=Customer orders and order details
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Isporučene narudžbe kupca
 OrdersInProcess=Narudžbe kupca u obradi
 OrdersToProcess=Narudžbe kupca za obradu
-SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersToProcess=Narudžbe za izvršenje
 StatusOrderCanceledShort=Otkazano
 StatusOrderDraftShort=Skica
 StatusOrderValidatedShort=Ovjereno
@@ -37,7 +37,7 @@ StatusOrderDeliveredShort=Dostavljeno
 StatusOrderToBillShort=Dostavljeno
 StatusOrderApprovedShort=Odobreno
 StatusOrderRefusedShort=Odbijeno
-StatusOrderBilledShort=Naplaćeno
+StatusOrderBilledShort=Zaračunato
 StatusOrderToProcessShort=Za obradu
 StatusOrderReceivedPartiallyShort=Djelomično isporučeno
 StatusOrderReceivedAllShort=Products received
@@ -50,11 +50,11 @@ StatusOrderProcessed=Obrađeno
 StatusOrderToBill=Dostavljeno
 StatusOrderApproved=Odobreno
 StatusOrderRefused=Odbijeno
-StatusOrderBilled=Naplaćeno
+StatusOrderBilled=Zaračunato
 StatusOrderReceivedPartially=Djelomično primljeno
 StatusOrderReceivedAll=All products received
 ShippingExist=Isporuka postoji
-QtyOrdered=Količina naručena
+QtyOrdered=Naručena količina
 ProductQtyInDraft=Količina robe u skicama narudžbi
 ProductQtyInDraftOrWaitingApproved=Količina proizvoda u skicama ili odobrenim narudžbama, nije još naručena
 MenuOrdersToBill=Isporučene narudžbe
@@ -88,7 +88,7 @@ NumberOfOrdersByMonth=Broj narudžba tijekom mjeseca
 AmountOfOrdersByMonthHT=Iznos narudžbi po mjesecu (bez PDV-a)
 ListOfOrders=Lista narudžbi
 CloseOrder=Zatvori narudžbu
-ConfirmCloseOrder=Are you sure you want to set this order to deliverd? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
 ConfirmDeleteOrder=Are you sure you want to delete this order?
 ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
 ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
@@ -99,7 +99,7 @@ ClassifyShipped=Označi kao isporučeno
 DraftOrders=Skica narudžbi
 DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Narudžbe u obradi
-RefOrder=Ref. narudžbe
+RefOrder=Broj narudžbenice
 RefCustomerOrder=Ref. narudžba kupca
 RefOrderSupplier=Ref. order for vendor
 RefOrderSupplierShort=Ref. order vendor
@@ -116,7 +116,7 @@ DispatchSupplierOrder=Zaprimanje narudžbe dobavljača %s
 FirstApprovalAlreadyDone=Prvo odobrenje je već napravljeno
 SecondApprovalAlreadyDone=Drugo odobrenje je već napravljeno
 SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
@@ -141,6 +141,7 @@ OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
 PDFEinsteinDescription=Cjeloviti model narudžbe (logo...)
+PDFEratostheneDescription=Cjeloviti model narudžbe (logo...)
 PDFEdisonDescription=Jednostavan model narudžbe
 PDFProformaDescription=Cjeloviti predračun (logo...)
 CreateInvoiceForThisCustomer=Naplata narudžbi
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index f463d9f611c..f4ff3ea6d8e 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Naslov
 WEBSITE_DESCRIPTION=Opis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang
index 4e7079b5912..9a3694339f3 100644
--- a/htdocs/langs/hr_HR/paybox.lang
+++ b/htdocs/langs/hr_HR/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Podešavanje PayBox modula
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Obrazac plaćanja
-WelcomeOnPaymentPage=Dobro došli na naš servis online plaćanja
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ova stranica vam dozvoljava da vršite online plaćanje prema %s
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=Za završiti
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ova stranica potvrđuje da je vaše plaćanje pohranjeno. Hvala Vam.
-YourPaymentHasNotBeenRecorded=Vaša uplata nije pohranjena i transakcija je otkazana. Hvala Vam.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametri računa
 UsageParameter=Parametri korištenja
 InformationToFindParameters=Pomoć za pronalaženje podataka o računu %s
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 037404fa5f5..da6c1a85e1a 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -31,13 +31,13 @@ PropalStatusDraft=Skica (potrebno ovjeriti)
 PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Potpisana (za naplatu)
 PropalStatusNotSigned=Nije potpisana (zatvorena)
-PropalStatusBilled=Naplaćena
+PropalStatusBilled=Zaračunato
 PropalStatusDraftShort=Skica
-PropalStatusValidatedShort=Ovjereno
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zatvorena
 PropalStatusSignedShort=Potpisana
 PropalStatusNotSignedShort=Nije potpisana
-PropalStatusBilledShort=Naplaćena
+PropalStatusBilledShort=Zaračunato
 PropalsToClose=Ponude za zatvaranje
 PropalsToBill=Potpisane ponude za naplatu
 ListOfProposals=Popis ponuda
@@ -45,7 +45,7 @@ ActionsOnPropal=Događaji vezani uz ponudu
 RefProposal=Broj ponude
 SendPropalByMail=Pošalji ponudu e-poštom
 DatePropal=Datum ponude
-DateEndPropal=Datum dospijeća
+DateEndPropal=Vrijedi do
 ValidityDuration=Vrijedi do
 CloseAs=Postavi status na
 SetAcceptedRefused=Postavi prihvaćeno/odbijeno
@@ -53,16 +53,16 @@ ErrorPropalNotFound=Ponuda %s nije pronađena
 AddToDraftProposals=Dodati skici ponude
 NoDraftProposals=Nema skica ponuda
 CopyPropalFrom=Izradi ponudu preslikom postojeće ponude
-CreateEmptyPropal=Izradi prazan predložak ponude ili popis proizvoda i usluga
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Osnovni rok valjanosti ponude (u danima)
-UseCustomerContactAsPropalRecipientIfExist=Ako je navedena, za ponudu upotrijebi adresu kontakta pri kupcu umjesto adrese tvrtke
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Kloniraj ponudu
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Ponude i stavke
 ProposalLine=Stavka ponude
-AvailabilityPeriod=Odgoda dostupnosti
-SetAvailability=Odredi odgodu dostupnosti
+AvailabilityPeriod=Rok isporuke
+SetAvailability=Odredi rok isporuke
 AfterOrder=poslije narudžbe
 OtherProposals=Ostale ponude
 ##### Availability #####
@@ -78,8 +78,9 @@ TypeContact_propal_external_CUSTOMER=Kontakt osoba pri kupcu za ponudu
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Cjeloviti model ponude (logo...)
+DocModelCyanDescription=Cjeloviti model ponude (logo...)
 DefaultModelPropalCreate=Izrada osnovnog modela
 DefaultModelPropalToBill=Osnovni predložak prilikom zatvaranja poslovne ponude (za naplatu)
 DefaultModelPropalClosed=Osnovni predložak prilikom zatvaranja poslovne ponude (nenaplaćeno)
-ProposalCustomerSignature=Pismeno prihvaćanje, pečat tvrtke, datum i potpis
+ProposalCustomerSignature=Potvrda narudžbe; pečat tvrtke, datum i potpis
 ProposalsStatisticsSuppliers=Statistika ponuda dobavljača
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index ff35b10630d..80ad690bf48 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteSetupDesc=Kreirajte različitih unosa koliko god to želite ovisno koliko web mjesta želite. Nakon toga idite na Websites izbornik za uređivanje istih.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Obriši Web mjesto
-ConfirmDeleteWebsite=Jeste li sigurni da želite obrisati ovo web mjesto. Sve stranice i sadržaj biti će isto obrisan.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Naziv stranice/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL vanjske CSS datoteke
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Mediji
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Uredi izbornik
 EditMedias=Edit medias
-EditPageMeta=Uredi meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Pregled vašeg web mjesta <strong>%s</strong> nije još dostupan. Prvo morate dodati stranicu.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=Pogledaj stranicu u novom tabu
 SetAsHomePage=Postavi kao početnu stranicu
 RealURL=Pravi URL
 ViewWebsiteInProduction=Pogledaj web lokaciju koristeći URL naslovnice
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index f80784a04db..4e6220d4369 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Demó módban kikapcsolva
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Az interneten további modulokat találhat...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modulok eszközök
 ModuleFamilyExperimental=Kísérleti modulok
 ModuleFamilyFinancial=Pénzügyi modulok (Számviteli / Kincstár)
 ModuleFamilyECM=Elektronikus Tartalom Kezelés (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menü kezelők
 MenuAdmin=Menüszerkesztő
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Felhasználók és csoportok
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=A vállalatok vezetése és a kapcsolattartó
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Kereskedelmi
 Module2Desc=Kereskedelmi irányítás
 Module10Name=Számvitel
@@ -501,7 +501,7 @@ Module23Desc=Ellenőrzése fogyasztása energiák
 Module25Name=Vevői megrendelések
 Module25Desc=Ügyfél érdekében vezetése
 Module30Name=Számlák
-Module30Desc=Ügyfél számlák és jóváírás, beszállítói számlák kezelése
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Beszállítók
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=HÉA-kulcsok vagy Értékesítés adókulcsok
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Fizetési feltételek
 DictionaryPaymentModes=Fizetési módok
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ökoadó (WEEE)
 DictionaryPaperFormat=Papírméretek
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label az alap, ha nincs fordítás megtalálható a kód
 LabelOnDocuments=Címke dokumentumok
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=A hónap végén
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Biztonsági audit események
-Audit=Könyvvizsgálat
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Listája Dolibarr biztonsági események
 SecurityEventsPurged=Biztonsági események kitisztítják
-LogEventDesc=Itt tud belépni a Dolibarr eseményeire biztonságosa. A rendszergazdák láthatják annak tartalmát menün keresztül <b>Rendszereszközök - Audit.</b> Figyelem, ez a funkció nagy mennyiségű adatot dolgozhat fel az adatbázisban!
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=Ez a terület áll rendelkezésre a felhasználók csak rendszergazda. Egyik Dolibarr engedélyek csökkentheti ezt a határt.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Nettó egységár egy termék
 TotalPriceAfterRounding=Teljes ár (nettó / ÁFA / incl adó) után a kerekítés
 ParameterActiveForNextInputOnly=Paraméter hatékony következő bemeneti csak
-NoEventOrNoAuditSetup=Nincs biztonsági esemény lett felvéve még. Ez lehet normális, ha ellenőrzés nincs engedélyezve a &quot;setup - biztonság - audit&quot; oldalon.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Nézze meg a helyi sendmail beállítása
 BackupDesc=Ahhoz, hogy egy teljes biztonsági mentést Dolibarr kell tennie:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index e4eb34af3e8..8e42a362e85 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank neve
 FinancialAccount=Fiók
 BankAccount=Bankszámla
 BankAccounts=Bankszámlák
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Számla fiók mutatása
 AccountRef=Pénzügyi mérleg ref
 AccountLabel=Pénzügyi mérleg címke
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Számla-cím
 BankAccountCountry=Számla országa
 BankAccountOwner=Számlatulajdonos neve
 BankAccountOwnerAddress=Számlatulajdonos címe
-RIBControlError=Az adatok megfelelőségének ellenőrzése hibát jelzett. Ez azt jelenti, hogy a számlaszámhoz köthető információ hiányos vagy hibás (ellenőrizze az országot, számlaszámot és az IBAN számot).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Számla létrehozás
 NewBankAccount=Új számla fiók
 NewFinancialAccount=Új pénzügyi számla
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Lehet egyeztetni
 Conciliate=Összeegyeztetni
 Conciliation=Egyeztetés
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Közé zárt fiókok
 OnlyOpenedAccount=Csak nyitott számla egyenlegeket
@@ -104,7 +105,7 @@ SocialContributionPayment=Szociális/költségvetési adó fizetés
 BankTransfer=Banki átutalás
 BankTransfers=Banki átutalások
 MenuBankInternalTransfer=Belső átutalás
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Feladó
 TransferTo=Címzett
 TransferFromToDone=A transzfer <b>%s</b> a <b>%s</b> a <b>%s</b> %s lett felvéve.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banki csekkek
 BankChecksToReceipt=Letétre váró csekkek
 ShowCheckReceipt=Mutasd a letéti csekk bizonylatát
-NumberOfCheques=Csekkek száma
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Visszalép a számlához
 ShowAllAccounts=Mutasd az összes fióknál
-FutureTransaction=Jövőbeni tranzakció. Nincs lehetőség egyeztetésre.
-SelectChequeTransactionAndGenerate=Válassza / filter ellenőrzéseket be kell vonni a csekket befizetés beérkezésének és kattintson a &quot;Create&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Határozza meg az egyeztetéssel összefüggő bank kivonatot. Használjon egy rövidíthető szám értéket: ÉÉÉÉHH or ÉÉÉÉHHNN
 EventualyAddCategory=Végezetül, határozzon meg egy kategóriát, melybe beosztályozza a könyvelési belyegyzéseket
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Csekk visszatéréséenk dátuma
 CheckRejected=Csekk visszatért
 CheckRejectedAndInvoicesReopened=Csekk visszatért és a számla újranyitott
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index c1b982899fc..26df565d103 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma számla
 InvoiceProFormaDesc=<b>Proforma számla</b> egy kép egy valódi számla, de nincs könyvelési értéke.
 InvoiceReplacement=Csere számla
 InvoiceReplacementAsk=A számla csere számlája
-InvoiceReplacementDesc=<b>Csere számla</b>A kifizetetlen számlák visszavonására és kicserélésére használható.<br><br>Megjegyzés: Csak olyan számla cserélhető ki, amelyre fizetés nem érkezett. Amennyiben a cserélni kívánt számla nincs lezárva, automatikusan lezárásra kerül és "Elhagyott" státuszt kap.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Jóváírás
 InvoiceAvoirAsk=Számlát javtó jóváíró számla
-InvoiceAvoirDesc=A <b>jóváírás</b> egy negatív számla, mellyel megoldják, ha egy számlán van egy összeget, ami különbözik a ténylegesen kifizetett összegtől (mert ügyfél túl sokat fizetett, vagy nem fizetett, például, mivel bizonyos termékeket visszaadott).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Visszafizetések
 DeletePayment=Fizetés törlése
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Beszállítók kifizetések
 ReceivedPayments=Fogadott befizetések
 ReceivedCustomersPayments=Vásárlóktól kapott befizetések
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Jóváhagyásra váró vásárlóktól fogadott befizetések
 PaymentsReportsForYear=Fizetések jelentései %s
 PaymentsReports=Fizetések jelentései
@@ -91,8 +91,8 @@ PaymentConditionsShort=Fizetési feltételek
 PaymentAmount=Fizetés összege
 ValidatePayment=Jóváhagyott fizetés
 PaymentHigherThanReminderToPay=Fizetés magasabb az emlékeztetőben leírtnál
-HelpPaymentHigherThanReminderToPay=Figyelem, a fizetett összeg egy vagy több számla esetén magasabb, mint a még fizetendő. <br> Szerkessze a bejegyzését, különben hagyja jóvá és gondolja meg egy jóváírás létrehozását a feleslegesen kapott minden túlfizetett számlákra.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Osztályozva mint 'Fizetve'
 ClassifyPaidPartially=Osztályozva mint 'Részben fizetve'
 ClassifyCanceled=Osztályozva mint 'Elhagyott'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zárt (nem fizetett)
 BillStatusClosedPaidPartially=Fizetett (részben)
 BillShortStatusDraft=Tervezet
 BillShortStatusPaid=Fizetett
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Fizetett
 BillShortStatusCanceled=Elveszett
 BillShortStatusValidated=Hitelesítve
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Lezárt
 BillShortStatusClosedPaidPartially=Fizetett (részben)
 PaymentStatusToValidShort=Hitelesítéshez
-ErrorVATIntraNotConfigured=Közösségen belüli adó száma nincs meghatározva
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Nincs alapértelmezett fizetési módot definiálva. Ugrás a számla modul beállításra a kijavítához.
 ErrorCreateBankAccount=Hozzon létre egy bank számlát, és menjen a Beállítás panelen a Számla modulra a fizetési módok meghatározására 
 ErrorBillNotFound=Számla %s nem létezik
-ErrorInvoiceAlreadyReplaced=Hiba, megpróbálja jóváhagyni a számla helyettesítő számlát %s. De ezt már felváltotta a %s számla.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Hiba, a kedvezmény már használt
 ErrorInvoiceAvoirMustBeNegative=Hiba, a helyetesítő számlátnak negatív összegűnek kell lennie
 ErrorInvoiceOfThisTypeMustBePositive=Hiba, az ilyen típusú számlán pozitív összegnek kell szerepelnie
 ErrorCantCancelIfReplacementInvoiceNotValidated=Hiba, nem lehet törölni egy számlát, a helyébe egy másik számlát, amelyet még mindig vázlat
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Feladó
 BillTo=Címzett
 ActionsOnBill=Műveletek a számlán
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Maradék egyenleg <b>(%s %s)</b> elengedésre kerül kedvezményként, mivel a kifizetés a határidő előtt történt. Az ÁFA-t korrigálom jóváírás készítésével.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Maradék egyenleg <b>(%s %s)</b> elengedésre kerül kedvezményként, mivel a kifizetés a hatridő elött történt. Az ÁFA-t nem korrigálm, a jóváírás áfája elvesztésre kerül.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Maradék egyenleg <b>(%s %s)</b> elengedésre kerül kedvezményként, mivel a kifizetés a határidő előtt történt. Az ÁFA-t visszaigénylem jóváírás készítése nélkül.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Rossz ügyfél
 ConfirmClassifyPaidPartiallyReasonProductReturned=Részben visszaszállított termékek
 ConfirmClassifyPaidPartiallyReasonOther=Összeg elhagyott más okból
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ez a választás akkor lehetséges, ha a számlát megfelelő megjegyzéssel látták el. (Példa: "Csak a kifizetett összeg áfája vonható le")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Egyes országokban ez a választás csak akkor lehetséges, ha a számla megfelelő megjegyzést tartalmaz.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Használja ezt minden más esetben.
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>rossz ügyfél</b> egy ügyfél, amely nem hajlandó fizetni a tartozását.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ez a választás akkor használatos, ha a fizetés nem teljes, mert egyes termékek kerültek vissza
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Használja ezt a választást, ha minden más, nem működik, például az alábbi esetekben: <br> - A fizetés nem teljesült, mert néhány terméket visszaszállítottak <br> - Az összegnél kifogás merült fel, mert a kedvezményt nem érvényesítették <br> Minden esetben a külömbséget javítani kell a könyvelési rendszerben jóváírás létrehozásával.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Más
 ConfirmClassifyAbandonReasonOtherDesc=Ez a választás fogja használni minden más esetben. Például azért, mert azt tervezi, hogy létrehoz egy számla helyett.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Számla jóváhagyása
 UnvalidateBill=Számla jóváhagyás törlése
-NumberOfBills=Számlák száma
-NumberOfBillsByMonth=Számlák száma havonta
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Számlák összege
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Összege a számlák havonta (adózott)
 ShowSocialContribution=Mutasd a szociális adót
 ShowBill=Számla megjelenítése
@@ -260,9 +262,9 @@ Repeatables=Minták
 ChangeIntoRepeatableInvoice=Konvertálás számlamintává
 CreateRepeatableInvoice=Számlaminta készítése
 CreateFromRepeatableInvoice=Létrehozás számlamintából
-CustomersInvoicesAndInvoiceLines=Vevői számlák és a számla sorai
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Vevői számlák és kifizetések
-ExportDataset_invoice_1=Vevői számlák listája és számla tételsorok
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Vevői számlák és befizetések
 ProformaBill=Proforma számla:
 Reduction=Csökkentés
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Szánmlázási cím
-HelpEscompte=Ez a kedvezmény egy engedmény a vevő részére, mert a befizetés már megtörtént előzőleg.
-HelpAbandonBadCustomer=Ez az összeg már Elveszett (kétes vevő), rendkívüli veszteségként leírva.
-HelpAbandonOther=Ez az összeg már elveszett, mivel valamilyen hiba történt (pl.: hibás vevő vagy a számla kicserélésre került)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Szociális/költségvetési adó fizetési azonosító
 PaymentId=Fizetés id
 PaymentRef=Fizetési hivatkozás
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nincs számla kiválasztva
 CloneInvoice=Számla klónozása
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Akció tiltva, mert számlát kicserélte
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb kifizetések
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Kedvezmény kettéosztása
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Bemenet összege a két részre:
-TotalOfTwoDiscountMustEqualsOriginal=Két új kedvezmény összegének meg kell egyeznie az eredeti kedvezmény összegével.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Kapcsolódó számla
 RelatedBills=Kapcsolódó számlák
 RelatedCustomerInvoices=Kapcsolódó ügyfélszámlák
 RelatedSupplierInvoices=Kapcsolódó beszállítói számlák
 LatestRelatedBill=Utolsó kapcsolódó számla
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Fizetési megjegyzés
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Csekk
 PaymentTypeShortCHQ=Csekk
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On-line fizetés
-PaymentTypeShortVAD=On-line fizetés
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Piszkozat
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Banki adatok
 BankCode=Bank kódja
-DeskCode=Íróasztal kód
+DeskCode=Office code
 BankAccountNumber=Számlaszám
-BankAccountNumberKey=Kulcs
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN szám
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT szám
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Fizetés átutalással a következő bankszá
 VATIsNotUsedForInvoice=* Nem alkalmazható ÁFA art-293B a CGI
 LawApplicationPart1=A jog alkalmazása a 80,335 12/05/80
 LawApplicationPart2=az áru tulajdonában marad:
-LawApplicationPart3=mint eladó, míg kiegyenlítik a teljes összeget 
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=azok árait.
 LimitedLiabilityCompanyCapital=SARL a főváros
 UseLine=Alkalmaz
@@ -463,7 +465,7 @@ Cheques=Csekkek
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Használja a vevő számlázási címet a harmadik fél kapcsolati címe helyett, mint a fogadó címét a számlákon
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Összes ki nem fizetett számlák mutatása
 ShowUnpaidLateOnly=Csak a későn fizetett számlák mutatása
 PaymentInvoiceRef=Fizetési számla %s
@@ -474,21 +476,22 @@ Reported=Késik
 DisabledBecausePayments=Nem lehetséges, mert van némi kifizetés
 CantRemovePaymentWithOneInvoicePaid=Nem lehet eltávolítani a fizetést, hiszen legalább egy számla kifizettetként osztályozott
 ExpectedToPay=Várható fizetés
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Ezzel a fizetéssel fizetve
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Beállítás "Fizetett"-ként. Az összes jóváírás teljes kifizetése megtörtén.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Minden számla nélkül is fizetni fogják automatikusan bezárja az állapota &quot;fizetni&quot;.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Kifizetés
 ToMakePaymentBack=Visszafizetés
 ListOfYourUnpaidInvoices=Nyitott számlák listája
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Illetékbélyeg
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Számla PDF sablon Crabe. A teljes számla sablon (Sablon ajánlott)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Hiba történt az összeg módosításakor a(z) %s soron
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=A rendszeres jövőbeni számlák kézi készítéséhez válassza a <strong>%s - %s - %s</strong> menüpontot.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 1a3b46496fb..2f66b289cb9 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Mutasd cég
 ShowStock=Mutasd raktár
 DeleteArticle=Kattintson, hogy távolítsa el ezt a cikket
 FilterRefOrLabelOrBC=Keresés (Ref/Cédula)
-UserNeedPermissionToEditStockToUsePos=Számla létrehozásánál készlet csökkentést kér, tehát az értékesítési hely kasszánál a felhasználónak készlet módosítási engedéllyel kell rendelkeznie.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Nyugta Nyomtató
+PointOfSale=Értékesítési pont
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index e75c2cff966..5f147660a9e 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefon hívás
 ActionAC_FAX=Fax küldés
 ActionAC_PROP=Ajánlat küldése emailben
 ActionAC_EMAIL=Email küldése
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Találkozók
 ActionAC_INT=Helyszíni beavatkozás
 ActionAC_FAC=Számla küldése vevők levélben
@@ -72,8 +73,8 @@ StatusProsp=Prospect állapot
 DraftPropals=Készítsen üzleti ajánlatot
 NoLimit=Nincs határ
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/hu_HU/dict.lang b/htdocs/langs/hu_HU/dict.lang
index 5ebdcb117fa..ad83089f799 100644
--- a/htdocs/langs/hu_HU/dict.lang
+++ b/htdocs/langs/hu_HU/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard-sziget és McDonald
 CountryVA=Apostoli Szentszék (Vatikáni Városállam)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonézia
 CountryIR=Irán
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Észak-Korea
 CountryKR=Dél-Korea
 CountryKW=Kuvait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Lettország
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongólia
 CountryMS=Montserrat
 CountryMZ=Mozambik
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namíbia
 CountryNR=Nauru
 CountryNP=Nepál
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad és Tobago
 CountryTR=Törökország
 CountryTM=Türkmenisztán
-CountryTC=Turks-és Cailos-szigetek
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajna
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rúpiát
 CurrencySingMUR=Mauritius rúpia
 CurrencyNOK=Norvég Krones
-CurrencySingNOK=Norvég korona
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunéziai dinár
 CurrencySingTND=Tunéziai dinár
 CurrencyUSD=USA dollár
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Szájról--szájra terjed
 DemandReasonTypeSRC_PARTNER=Parner
 DemandReasonTypeSRC_EMPLOYEE=Foglalkoztató
 DemandReasonTypeSRC_SPONSORING=Szponoráció
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formátum 4A0
 PaperFormatEU2A0=Formátum 2A0
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index cb69e810476..6dc5fa0dbe9 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Dokumentumok száma a könyvtárban
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Könyvtár
 ECMSectionManual=Kézi könyvtár
 ECMSectionAuto=Automatikus könyvtár
@@ -34,6 +34,8 @@ ECMDocsByProjects=Projektekkel kapcsolatos dokumentumok
 ECMDocsByUsers=Felhasználókkal kapcsolatos dokumentumok
 ECMDocsByInterventions=Beavatkozásokkal kapcsolatos dokumentumok
 ECMDocsByExpenseReports=Költség-kimutatásokhoz kapcsolódó dokumentumok
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nem lett könyvtár létrehozva
 ShowECMSection=Könyvtár mutatása
 DeleteSection=Könyvtár eltávolítása
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index a9b00ace43b..5ad9f0a5961 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hu_HU/help.lang b/htdocs/langs/hu_HU/help.lang
index d39238398c3..3c0cef91b08 100644
--- a/htdocs/langs/hu_HU/help.lang
+++ b/htdocs/langs/hu_HU/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online Valós idejü / távoli támogatás
 OtherSupport=Más jellegü támogatás
 ToSeeListOfAvailableRessources=Kapcsolatba lépni / látni az elérhető erőforrásokat:
 HelpCenter=Segítség központ
-DolibarrHelpCenter=Dolibarr Segítség és Támogatási központ
-ToGoBackToDolibarr=Különben, kattintson <a href="%s">ide</a> a Dolibarr használatához
-TypeOfSupport=Támogatás forrása
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Közösség (ingyenes)
 TypeSupportCommercial=Üzleti
 TypeOfHelp=Típus
@@ -15,12 +15,9 @@ NeedHelpCenter=Segítségre vagy támogatásra van szüksége?
 Efficiency=Hatékonyság
 TypeHelpOnly=Csak segítség
 TypeHelpDev=Segítség és fejlesztés
-TypeHelpDevForm=Segítség, fejlesztés és formálás
-ToGetHelpGoOnSparkAngels1=Egyes cégek gyors (időnként azonnali) segítséget tudnak nyújtani, azzal, hogy a gépe fölött átveszik az irányítást. Ilyen cégek listája a <b>%s</b> weboldalon található:
-ToGetHelpGoOnSparkAngels3=Ugyanakkor megtekintheti a Dolibarr oktatók listáját erre a gomra kattintva
-ToGetHelpGoOnSparkAngels2=Bizonyos esetekben nincs elérhető cég, változtassa meg a keresését "minden elérhető"-re. Több kérést tud így elküldeni.
-BackToHelpCenter=Más esetben, kattintson ide, hogy visszatérjen a <a href="%s">Segítség központ nyitólap</a>jára.
-LinkToGoldMember=Hívhatja az egyik előre kiválasztott az ön nyelvén (%s) tudó Dolibarr oktatót ha erre a Widget-re kattint (álltapot és maximális ár autómatikusan frissül):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Támogatott nyelvek
-SubscribeToFoundation=Segítse a Dolibarr projektet, iratkozzon fel az alapítványhoz
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Hivatalos Dolibarr támogatás a saját nyelvén: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index 8f0ca2eebb6..912b5fff747 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Kezdési dátum
 DateFinCP=Befejezési dátum
@@ -15,13 +15,18 @@ ApprovedCP=Jóváhagyott
 CancelCP=Megszakítva
 RefuseCP=Megtagadta
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Leírás
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Szerkesztés
 DeleteCP=Törlés
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Ok
 UserCP=Felhasználó
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 440de0628b4..81d831d1d05 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Csak kövesse az utasitásokat lépésrõl lépésre.
 MiscellaneousChecks=Előeltételek ellenörézse
 ConfFileExists=<b>%s</b> konfigurációs fájl már létezik.
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> konfigurációs fájl NEM létezik és NEM lehet létrehozni!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=<b>%s</b> konfigurációs fájl létrehozható.
-ConfFileIsNotWritable=<b>%s</b> konfigurációs fájl NEM írható. Ellenõrizze a jogosúltságokat. Elsõ telepítés esetén, a web szervernek tudnia kell írni ebbe a fájlba a konfigurációs folyamat során (Unix alapu rendszer esetén "chmod 666").
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=<b>%s</b> konfigurációs fájl írható.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Minden újratöltése információt konfigurációs fájlban.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Ez a PHP verzió támogatja a munkameneteket.
 PHPSupportPOSTGETOk=Ez a PHP verzió támogatja POST és GET változókat.
-PHPSupportPOSTGETKo=Lehetséges, hogy az alkalmazott PHP verzió NEM támogatja a POST és/vagy GET változókat. Ellenõrizze a  <b>variables_order</b> paramétert a php.ini fájlban.
-PHPSupportGD=Ez a PHP verzió támogatja a GD grafikai funkciókat.
-PHPSupportCurl=Ennek a PHP-nak a támogató Curl-ja.
-PHPSupportUTF8=Ez a PHP verzió támogatja az UTF8 funkciókat.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=A munkamenetek maximális memóriája <b>%s</b>. Ennek elégnek kéne lennie.
-PHPMemoryTooLow=A munkamenetek maximális beállított memóriája <b>%s</b> byte. Ez kevés lesz. Állítsa át a <b>php.ini</b>-ben a <b>memory_limit</b> paramétert legalább <b>%s</b> byte-ra.
-Recheck=Kattintson ide egy részletesebb tesztért
-ErrorPHPDoesNotSupportSessions=Ez a PHP verzió NEM támogatja a munkameneteket. Erre szükség van a Dolibarr futtatásához. Kérjük ellenõrizze a PHP beállításait.
-ErrorPHPDoesNotSupportGD=Ez a PHP verzió NEM támogatja a GD grafikai funkciókat. A grafikonok nem lesznek elérhetõek.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=A PHP telepítése nem támogatja a Curl-t.
-ErrorPHPDoesNotSupportUTF8=Ez a PHP verzió NEM támogatja az UTF8 funkciókat. A Dolibarr így nem tud rendesen mûködni. Kérjük oldaj meg mielött végrehajtaná a telepítést.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=%s könyvtár nem létezik.
-ErrorGoBackAndCorrectParameters=Menjen vissza és javítsa ki a rossz paramétereket.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Lehet, hogy rossz értéket adott meg a(z) '%s' paraméter számára.
 ErrorFailedToCreateDatabase=Nem sikerült létrehozni a(z) '%s' adatbázist.
 ErrorFailedToConnectToDatabase=Nem sikerült csatlakozni a(z) '%s' adatbázishoz.
 ErrorDatabaseVersionTooLow=Az adatbázis (%s) verziója túl alacsony. %s verzió vagy magasabb szükséges
 ErrorPHPVersionTooLow=Túl régi a PHP verzió. Legalább %s kell.
-ErrorConnectedButDatabaseNotFound=Sikeres kapcsolódás az adatbázis szerverhez, de a(z) '%s' adatbázis nincs meg.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists='%s' adatbázis már létezik.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ha az adatbázis nem létezik akkor menjen vissza és jelölje ki az "Adatbázis létrehozása" opciót.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ha az adatbázis már létezik, menjen vissza és ne válassza az "Adatbázis létrehozása" opciót.
-WarningBrowserTooOld=A böngésző verziója túl alacsony. A legfrissebb verziójú Firefox, Chrome vagy Opera használata erősen ajánlott. 
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Verzió
 License=Használatban lévõ licensz
 ConfigurationFile=Konfigurációs fájl
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Adatbázis
 DatabaseType=Adatbázis típus
 DriverType=Meghajtó típus
 Server=Szerver
-ServerAddressDescription=Adatbûzis szerver neve vagy IP címe, általában 'localhost' vagy '127.0.0.1' ha ugyan az a webszerver és az adatbázis szerver
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Adatbázis szerver port. Hagyja üresen ha nem tudja.
 DatabaseServer=Adatbázis szerver
 DatabaseName=Adatbázis név
-DatabasePrefix=Adatbázis tábla előtag
-AdminLogin=Adatbázis tulajdonos bejelentkezési neve.
-PasswordAgain=Jelszó mégegyszer
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Adatbázis tulajdonos jelszava.
 CreateDatabase=Adatbázis lérehozása
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Adatbázis szerver - Superuser hozzáférés
-CheckToCreateDatabase=Pipálja ki a dobozt ha szeretné, hogy a rendszer létrehozza az adatbázist.<br>Ebbben az esetben a SuperUser bejelentkezési adatait ki kell tölteni az oldal alján.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=A felhasználó jogosúlt új adatbázisok vagy új felhasználók létrehozására, felesleges ha a szolgáltatás hostolt formában veszik igénybe.
-KeepEmptyIfNoPassword=Hagyja üresen ha a felhasználónak nincs jelszava (az ilyet jobb elkerülni)
-SaveConfigurationFile=Értékek mentése
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Szerver kapcsolat
 DatabaseCreation=Adatbázis létrehozása
 CreateDatabaseObjects=Adatbázis objektumok létrehozása
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Külsõ kulcsok és indexek létrehozása a(z) %s tábla
 OtherKeysCreation=Idegen Külsõ kulcsok és indexek létrehozása
 FunctionsCreation=Funkciók létrehozása
 AdminAccountCreation=Adminisztrátor bejelntkezés létrehozása
-PleaseTypePassword=Kérjük adjon meg egy jelszót, üres jelszavak használata nem megenegedett!
-PleaseTypeALogin=Kérjük adjon meg egy bejelentkezési nevet!
-PasswordsMismatch=A két jelszó eltér, próbálja újra!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Telepítés vége
 SystemIsInstalled=A telepítés készen van.
 SystemIsUpgraded=Dolibarr frissítése sikeres.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Most már konfiguálhatja a Dolibarr-t az igényei sze
 AdminLoginCreatedSuccessfuly=Dolibarr adminisztrátor bejelentkezés '<b>%s</b>' sikeresen létrehozva.
 GoToDolibarr=Ugrás a Dolibarr-ba
 GoToSetupArea=Ugrás a Dolibarr-ba (beállítási terültre)
-MigrationNotFinished=Az adatbázis verziója nem teljesen, kérjük futassa újra a frissítést.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Ugrás a frissítési oldalra
 WithNoSlashAtTheEnd="/" nélkül a végén
-DirectoryRecommendation=Ajánlatos a weblap könyvtárán kívüli könyvtárat megadni.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Már létezik
 DolibarrAdminLogin=Dolibarr admin bejelentkezés
-AdminLoginAlreadyExists='<b>%s</b>' Dolibarr adminisztrátor fiók már létezik. Lépjen vissza, ha másikat szeretne létrehozni.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Nem tudta létrehozni a Dolibarr rendszergazda fiókot.
-WarningRemoveInstallDir=Figyelem, biztonsági okok miatt, amint végez a telepítés/frissítés folyamattal, annak véletlenszerű indításának elkerülésére adja hozzá az <b>install.lock<b> filet a Dollibar dokumentum könyvtárba, hogy elkerülje annak indítását.
-FunctionNotAvailableInThisPHP=Nem elérhetõ ezen a PHP verzión
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Migrációs szkript választása
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Szkript feldolhozása
 ChooseYourSetupMode=Válassta ki a telepítési módot és kattintson a "START"-ra...
 FreshInstall=Friss telepítés
-FreshInstallDesc=Használja ezt a módot ha még nem telepítette soha a rendszert. Ez a mód ki tudja javítani egy korább sikertelen telepítést, de ha frissíteni akar használja a "Frissítés" lehetõséget.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Frissítés
 UpgradeDesc=Használja ezt a módot, ha már helyettesítette a régi fájlokat az újabb verzió fájlaival. Frissíti az adatbázist és az adatokat.
 Start=START
 InstallNotAllowed=Telepítés nincs engedélyezve a <b>conf.php</b> fájlban
 YouMustCreateWithPermission=Létre kell hoznia %s fájlt és írásai jogokat adnia a webszerveren a telepítés idejére.
-CorrectProblemAndReloadPage=Kérjük javítsa ki a problémát és F5-el frissítsen.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Már migárlva
 DatabaseVersion=Adatbázis verzió
 ServerVersion=Adatbázis szerver verzió
 YouMustCreateItAndAllowServerToWrite=Létre kell hoznia ezt a könyvtárat és engedélyeznie a szervenek, hogy írhasson bele.
 DBSortingCollation=Karakter rendezés
-YouAskDatabaseCreationSoDolibarrNeedToConnect=A(z) <b>%s</b> adatbázis létrehozásához az  <b>%s</b> adatbázis szerverhez SuperUser <b>%s</b> jogosultságokkal kell csatlakozni.
-YouAskLoginCreationSoDolibarrNeedToConnect=A(z) <b>%s</b> adatbázis létrehozásához az  <b>%s</b> adatbázis szerverhez SuperUser <b>%s</b> jogosultságokkal kell csatlakozni.
-BecauseConnectionFailedParametersMayBeWrong=A kapcslódás sikertelen, a hosz és/vagy a SuperUser bejelentkezési adatok hibásan lettek megadva.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=%s metódus által felfedezett árva fizetések vannak a rendszerben
 RemoveItManuallyAndPressF5ToContinue=Távolítsa el manuálisan, majd F5-el frissítsen.
 FieldRenamed=Mezõ átnevezve
-IfLoginDoesNotExistsCheckCreateUser=Ha bejelentkezési adat nem létezik használja a "Felhasználó létrehozása" lehetõséget
-ErrorConnection=Server "<b>%s</b>", adatbázis név "<b>%s</b>", login "<b>%s</b>", vagy adatbázis jelszó rosszúl lett megadva vagy a PHP kliens verzió túl régi az adatbázis verzióhoz képest.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=A javasolt választás <b>%s</b> verzióra frissítés a <b>%s</b> jelenlegi verzióról
 InstallChoiceSuggested=<b>A telepítõ által javasolt választás</b>.
-MigrateIsDoneStepByStep=A megcélzott változat (%s) van egy rés a több változata, így telepítése varázsló vissza fog térni arra utalnak következő migráció egyszer ez is elkészül.
-CheckThatDatabasenameIsCorrect=Ellenõrizze hogy a(z) "<b>%s</b>" adatbázis név helyes.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Ha a név jó és a megadott adatbázis nem létezik, használja az "Adatbázis létrehozása" opciót.
 OpenBaseDir=PHP openbasedir paraméter
-YouAskToCreateDatabaseSoRootRequired=Használja a "Adatbázis létrehozása" opciót. Ehhez meg kell adnia a SuperUser fiók adatait az oldal alján.
-YouAskToCreateDatabaseUserSoRootRequired=Használja a "Adatbázis tulajdonos létrehozása" opciót. Ehhez meg kell adnia a SuperUser fiók adatait az oldal alján.
-NextStepMightLastALongTime=A jelenlegi lépés akár több percig is eltarthat. Kérjük várjon amig a következõ oldal teljesen be nem töltõdik mielött folytatná.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Szállítási rendelések migrálása
 MigrationShippingDelivery=Szállítási tárló frissítése
 MigrationShippingDelivery2=Szállítási tárló frissítése 2
 MigrationFinished=Migráció befejezte
-LastStepDesc=<strong>Utolsó lépés:</strong> Adjuk meg itt bejelentkezési név és jelszó használatát tervezi, hogy csatlakozik a szoftver. Ne veszítse/felejtse el ezt, mivel ez a fiók felelős a többi meghatározására.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Modul aktiválása %s
 ShowEditTechnicalParameters=Klikkelj ide a haladó beállítasok megtekintéséhez/szerkezstéséhez. (szakértő mód)
-WarningUpgrade=Figyelem!\nKészült biztonsági másolat az adatbázisról?\nErősen ajánlott: például az adatbázis rendszer néhány hibája miatt (pl. a 5.5.40/41/42/43 verzióban) a folyamat során néhány adat vagy tábla elveszhet, ezért erősen ajánlott egy teljes másolat készítése az adatbázisról, mielőtt a migráció elindul.\n\nVálaszd az OK gombot a migráció elindításához
-ErrorDatabaseVersionForbiddenForMigration=Az adatbázis verziója %s. Ez a verzió kritikus hibát tartalmaz az az adatbis struktúrájának megváltoztatásakor, ami a migrációs folyamat során szükséges. Ennek elkerülése érdekében a migráció nem engedélyezett, amíg az adatbázis nem kerül frissítésre egy magasabb stabil verzióra. (Az ismert hibás verziókat lásd itt:%s)
-KeepDefaultValuesWamp=A DoliWamp-ot használja a Dolibarr telepítéséhez, az itt lévõ értékek már optimalizálva vannak. Csak saját felelõsségre módosítsa ezeket.
-KeepDefaultValuesDeb=Linux csomagból (Ubuntun, Fedora vagy Debian, ...) használja a telepítési varázslót, az itt lévõ értékek már optimalizálva vannak. Csak az adatbázis tulajdonosnak kell jelszót megadni. Csak saját felelõsségre módosítsa ezeket az értékeket.
-KeepDefaultValuesMamp=A DoliMamp-ot használja a Dolibarr telepítéséhez, az itt lévõ értékek már optimalizálva vannak. Csak saját felelõsségre módosítsa ezeket.
-KeepDefaultValuesProxmox=Ön használja az Dolibarr Setup Wizard egy Proxmox virtuális készüléket, így az itt javasolt értékek már optimalizálva. Megváltoztatni őket, ha tudod, mit csinálsz.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Üzleti ajánlatok migrációja
 MigrationInvoice=Ügyfél számlák migrációja
 MigrationContract=Szerzõdések migrációja
-MigrationSuccessfullUpdate=Frissítés sikeres
+MigrationSuccessfullUpdate=A frissítés sikeres
 MigrationUpdateFailed=Sikeretelen frissítés
 MigrationRelationshipTables=Kapcsolati táblák migrációja (%s)
 MigrationPaymentsUpdate=Fizetési adatok korrekciója
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Szerzõdési adatok javítása
 MigrationContractsNumberToUpdate=%s szerzõdés(ek) várn(nak) frissítésre
 MigrationContractsLineCreation=%s számú szerzõdés számára új sorok létrehozása
 MigrationContractsNothingToUpdate=Nincs több tenni való
-MigrationContractsFieldDontExist=fk_facture mezõ nem létezik többé. Nincs több tenni való.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Szerzõdés üres dátumának korrekciója
-MigrationContractsEmptyDatesUpdateSuccess=Szerzõdés üres dátumának korrekciója sikeresen lezajlott
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Nincs szerzõdés üres dátummal
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nincs szerzõdés üres létrehozási dátummal
 MigrationContractsInvalidDatesUpdate=Szerzõdés érvénytelen dátumának korrekciója
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Szállítások frissítése
 MigrationStockDetail=Termékek készletének frissítése
 MigrationMenusDetail=Dinamikus menük frissítése
 MigrationDeliveryAddress=Szállítási címek frissítése
-MigrationProjectTaskActors=Migárlás llx_projet_task_actors tábla részére
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Adatok migrálása fk_user_resp/llx_projet llx_element_contact -ba
 MigrationProjectTaskTime=Frissítési idõ másodpercekben
 MigrationActioncommElement=Frissítés adatok akciók
 MigrationPaymentMode=Adatmigráció fizetési mód
 MigrationCategorieAssociation=Kategória migrálása
-MigrationEvents=Az események migrálásához az események tulajdonosát be kell állítani a szükséges táblában
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Üres mező érték frissítése: llx_societe_remise
 MigrationRemiseExceptEntity=Üres mező érték frissítése: llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Modul újratöltése %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Nem elérhető opciók mutatása
-HideNotAvailableOptions=Nem elérhető opciók elrejtése
-ErrorFoundDuringMigration=Migráció alatt hiba történt, így nem lehet végrehajtani a következő lépést. A hibák elvetéséhez, végrehajthatja a <a href="%s">kattintson ide</a>, de az alkalmazás egyes lehetőségei nem fognak megfelelően működni a hibajavítás nélkül.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 5b66c4bcb82..bd94ee04a2c 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kapcsolat/cím ehhez a harmadik félhez
 ContactsAddressesForCompany=Kapcsolat/cím ehhez a harmadik félhez
 AddressesForCompany=Cím ehhez a harmadik félhez
 ActionsOnCompany=Ezzel a harmadik féllel kapcsolatos események
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Események ezzel a taggal kapcsolatban
 ActionsOnProduct=Events about this product
 NActionsLate=%s késés
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Állítsa be a pénznemet
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Weboldalak
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Költség kimutatások
 HR=Személyügy
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Készletnyilvántartás
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 3e50aa40bc7..d00f6b9f0c6 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Csatolt objektum
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Cím
 WEBSITE_DESCRIPTION=Leírás
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/hu_HU/paybox.lang b/htdocs/langs/hu_HU/paybox.lang
index aea7c2dd326..47e38007f7b 100644
--- a/htdocs/langs/hu_HU/paybox.lang
+++ b/htdocs/langs/hu_HU/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox modul beállítás
 PayBoxDesc=Ez a nodul lehetővé teszi az oldalak számára a <a href="http://www.paybox.com" target="_blank">Paybox</a>-on keresztüli fizetést az ügyfelek számára. Ingyenes fizetési megoldás.
 FollowingUrlAreAvailableToMakePayments=Következő URL-ek elérhetők a vevő részére egy oldal felajánlásához a Dollibar objektumok kifizetéséhez
 PaymentForm=Fizetési ürlap
-WelcomeOnPaymentPage=Üdvözöljük az online fizetési oldalunkon
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ez az oldal lehetővé teszi az online fizetést %s számára.
 ThisIsInformationOnPayment=Ez az információ a fizetendő tételről
 ToComplete=Befejezni
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL egy %s online fizetési felhasználói
 ToOfferALinkForOnlinePaymentOnContractLine=URL egy %s online fizetési felhasználói csatolót ajánl egy vevői tétel sorhoz
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL egy %s online fizetési felhasználói csatolót ajánl egy ingyenes összeghez
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL egy %s online fizetési felhasználói csatolót ajánl egy tag feliratkozáshoz
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Hozzáadhat URL paramétereket <b>&tag=<i>érték</i></b> bármely ilyen URL (csak az ingyenes fizetéshez szükséges) a saját fizetési megjegyzés címke hozzáadásához.
-SetupPayBoxToHavePaymentCreatedAutomatically=PayBox beállítása ezzel az url-el <b>%s</b> a fizetések automata létrehozásához a paybox érvényesítése után.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ez az oldal megerősíti, hogy a fizetési lett felvéve. Köszönöm.
-YourPaymentHasNotBeenRecorded=Ön fizetést nem került rögzítésre és az ügylet törlésre került. Köszönöm.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Számla paraméterek
 UsageParameter=Használat paraméterek
 InformationToFindParameters=Segíts, hogy megtaláld a %s fiókadatokat
diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
index 43cf94e913b..f552d4e863a 100644
--- a/htdocs/langs/hu_HU/propal.lang
+++ b/htdocs/langs/hu_HU/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Aláírt (szükséges számlázási)
 PropalStatusNotSigned=Nem írta alá (zárt)
 PropalStatusBilled=Kiszámlázott
 PropalStatusDraftShort=Tervezet
-PropalStatusValidatedShort=Hitelesítetve
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zárva
 PropalStatusSignedShort=Aláírt
 PropalStatusNotSignedShort=Nem írták alá
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s nem található
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Hozzon létre a kereskedelmi javaslat másolásával meglévő javaslat
-CreateEmptyPropal=Hozzon létre üres üzleti ajánlatot vierge vagy listából termékek / szolgáltatások
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Alapértelmezett érvényesség időtartamát kereskedelmi javaslat (napokban)
-UseCustomerContactAsPropalRecipientIfExist=Használja ügyfélkapcsolati címet, ha meghatározott harmadik személy helyett a javaslat címét címzett címét
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klón kereskedelmi javaslat
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Ügyfélkapcsolati nyomon követése javasl
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A javaslat teljes modell (logo. ..)
+DocModelCyanDescription=A javaslat teljes modell (logo. ..)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index bae417c085c..04ceec1b548 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kód
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=A honlap törlése
-ConfirmDeleteWebsite=Biztos benne, hogy le akarja törölni a honlapot? Az összes oldal és tartalom el fog veszni!
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Olvas
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 93a347fcc61..82b94f3d44c 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Modul Percobaan
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Komersil
 Module2Desc=Commercial management
 Module10Name=Akunting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Pesanan Pelanggan
 Module25Desc=Customer order management
 Module30Name=Nota
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Pemasok
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=diakhir bulan
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Kode Pos
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 01ae4bcab9a..20f87cf09a7 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Akun
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Dari
 TransferTo=Kepada
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index a7a5c56778c..deef063653c 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Tagihan Proforma
 InvoiceProFormaDesc=<b>Tagihan Proforma</b> adalah gambaran untuk tagihan sebenarnya tapi tidak mempunyai nilai akutansi.
 InvoiceReplacement=Taghian pengganti
 InvoiceReplacementAsk=Tagihan pengganti untuk tagihan
-InvoiceReplacementDesc=<b>Tagihan pengganti</b> digunakan untuk pembatalan dan penggantian penuh sebuah tagihan dengan tidak adanya pembayaran yang sudah diterima.<br><br>Catatan: Hanya tagihan - tagihan dengan tidak ada pembayaran yang bisa di ganti. Jika tagihan yang Anda gantikan belum ditutup, akan ditutup yang untuk ditinggalkan secara otomatis.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Catatan kredit
 InvoiceAvoirAsk=Catatan kredit untuk tagihan yang cocok atau yang sudah benar
-InvoiceAvoirDesc=<b>Catatan kredit</b> adalah catatan untuk tagihan negatif yang biasanya digunakan sebagai bukti  fakta terhadap tagihan yang jumlah tagihannya berbeda dari jumlah yang seharusnya dibayar (contoh kasus: pelanggan yang pembayarannya lebih karena kesalahan pelanggan, atau tidak akan dibayarkan sejak beberapa produk atau barang dikembalikan).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Dibayar kembali
 DeletePayment=Hapus pembayaran
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Semua pembayaran untuk semua pemasok / supplier
 ReceivedPayments=Semua pembayaran yang diterima
 ReceivedCustomersPayments=Semua pembayaran yang diterima dari semua pelanggan
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Pembayaran dari pelanggan - pelanggan untuk divalidasi
 PaymentsReportsForYear=Laporan - laporan semua pembayaran untuk %s
 PaymentsReports=Laporan - laporan semua pembayaran
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Jumlah pembayaran
 ValidatePayment=Validasi pembayaran
 PaymentHigherThanReminderToPay=Pengingat untuk pembayaran yang lebih tinggi
-HelpPaymentHigherThanReminderToPay=Untuk diperhatikan, jumlah pembayaran baik yang hanya satu atau lebih dari satu tagihan yang lebih banyak dan mempunyai sisa untuk dibayar. <br> Ubah entri Anda, jika tidak mengkonfirmasikan dan terpikir untuk membuat sebuat catatan kredit kelebihan yang diterima untuk setiap tagihan yang mempunyai kelebihan bayar.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Menggolongkan 'Telah dibayar'
 ClassifyPaidPartially=Menggolongkan 'Telah dibayarkan sebagian'
 ClassifyCanceled=Menggolongkan 'Ditinggalkan'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Ditutup (yang belum dibayar)
 BillStatusClosedPaidPartially=Dibayar (sebagian / cicil)
 BillShortStatusDraft=Konsep
 BillShortStatusPaid=Dibayar
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Dibayar
 BillShortStatusCanceled=Diabaikan
 BillShortStatusValidated=Divalidasi
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Ditutup
 BillShortStatusClosedPaidPartially=Dibayar (sebagian / cicil )
 PaymentStatusToValidShort=Untuk divalidasi
-ErrorVATIntraNotConfigured=Nomor intra-komunateri VAT belum di definisikan
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Belum ada mode acuan yang di definisikan. Silahkan ke halaman pengaturan modul Tagihan untuk memperbaiki masalah ini.
 ErrorCreateBankAccount=Buat sebuah akun bank, kemudian dilanjutkan ke panel pengaturan / setup modul Tagihan untuk mendefinisikan mode pembayaran 
 ErrorBillNotFound=Tagihan %s tidak ada
-ErrorInvoiceAlreadyReplaced=Ada kesalahan, Anda mencoba untuk memvalidasi sebuah tagihan untuk menggantikan tagihan %s. Tapi yang satu ini sudah pernah digantikan oleh tagihan %s
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Ada kesalahan, diskonto sudah digunakan
 ErrorInvoiceAvoirMustBeNegative=Ada kesalahan, tagihan yang sudah terkoreksi  harus punya setidaknya satu jumlah negatif
 ErrorInvoiceOfThisTypeMustBePositive=Ada kesalahan, tagihan jenis ini harus punya setidaknya satu jumlah positif
 ErrorCantCancelIfReplacementInvoiceNotValidated=Ada kesalahan, tagihan yang pernah diganti dengan tagihan lain tidak bisa digantikan kalau masih dalam status konsep
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Dari
 BillTo=Kepada
 ActionsOnBill=Tindak lanjut tagihan
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Lainnya
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Konsep
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index 96a13d8278a..5c205b96886 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
index 78f2e0038dd..91c3e5067a1 100644
--- a/htdocs/langs/id_ID/commercial.lang
+++ b/htdocs/langs/id_ID/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/id_ID/dict.lang b/htdocs/langs/id_ID/dict.lang
index 4e75c40182c..f16d2d943ce 100644
--- a/htdocs/langs/id_ID/dict.lang
+++ b/htdocs/langs/id_ID/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=karyawan
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
index 2cd72ef2b91..f774506f252 100644
--- a/htdocs/langs/id_ID/ecm.lang
+++ b/htdocs/langs/id_ID/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/id_ID/help.lang b/htdocs/langs/id_ID/help.lang
index 191996ba722..dd8bb1ef933 100644
--- a/htdocs/langs/id_ID/help.lang
+++ b/htdocs/langs/id_ID/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Komersil
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index dda30ac99fb..febebfc95e0 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Cuti
-CPTitreMenu=Cuti
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Pernyataan bulanan
 MenuAddCP=Permintaan cuti baru
-NotActiveModCP=Kamu harus mengaktifkan modul cuti untuk melihat halaman ini.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Buat sebuah permintaan cuti
 DateDebCP=Tanggal mulai
 DateFinCP=Tanggal Akhir
@@ -15,13 +15,18 @@ ApprovedCP=Disetujui
 CancelCP=Dibatalkan
 RefuseCP=Ditolak
 ValidatorCP=Penyetuju
-ListeCP=Daftar yang Cuti
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Keterangan
 SendRequestCP=Buat permintaan cuti
 DelayToRequestCP=Permintaan cuti harus dilakukan setidaknya <b>%s day(s)</b> sebelum mereka.
-MenuConfCP=Sisa cuti
-SoldeCPUser=Sisa cuti tinggal <b>%s</b> hari.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Anda harus memilih tanggal akhir lebih besar dari tanggal mulai.
 ErrorSQLCreateCP=Sebuah kesalahan SQL terjadi dalam pembuatan:
 ErrorIDFicheCP=Sebuah kesalahan telah terjadi, permintaan cuti tidak ada.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Kamu tidak diizinkan untuk membaca permintaan cuti ini.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 15a99541abb..76e5df66fce 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Ikuti setiap langkah sesuai dengan instruksi
 MiscellaneousChecks=Peninjauan prasyarat
 ConfFileExists=File konfigurasi <b>%s</b> telah ada
-ConfFileDoesNotExistsAndCouldNotBeCreated=File konfigurasi <b>%s</b>  tidak ada dan tidak dapat dibuat
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=File konfigurasi <b>%s</b>  dapat dibuat
-ConfFileIsNotWritable=File konfigurasi <b>%s</b>  tidak dapat ditulis ulang. Periksa hak akses file. Untuk instalasi pertama kali, web server harus dapat menulisi file tersebut selama proses konfigurasi (sebagai contoh perintah "chmod 666" pada sistem operasi berbasis Unix").
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=memuat ulang semua informasi dari berkas konfigurasi
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=PHP ini mendukung fungsi grafik GD
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=PHP ini mendukung fungsi UTF8
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=PHP anda tidak mendukung fungsi grafik GD. Grafik tidak dapat ditampilkan
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=PHP anda tidak mendukung fungsi UTF8. Dolibarr tidak dapat berfungsi semestinya. Selesaikan hal tersebut sebelum proses instalasi Dolibarr
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Gagal untuk terhubung pada basis data '%s'
 ErrorDatabaseVersionTooLow=Versi basis data (%s) terlalu lama. Dibutuhkan versi %s atau lebih
 ErrorPHPVersionTooLow=Versi PHP terlalu lama. Dibutuhkan versi %s
-ErrorConnectedButDatabaseNotFound=Koneksi pada server sukses namun basis data '%s' tidak dapat ditemukan
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Versi peramban terlalu lama. Sangat disarankan untuk pemutakhiran peramban Firefox, Chrome atau Opera  pada versi terkini.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Versi PHP
 License=Penggunaan lisensi
 ConfigurationFile=Berkas Konfigurasi
@@ -45,22 +45,23 @@ DolibarrDatabase=Basis Data Dolibarr
 DatabaseType=Jenis Basis Data
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Server Database
 DatabaseName=Nama Database
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Ketikkan ulang kata kunci
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Koneksi Server
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Mohon ketikkan kata kunci, tidak diperbolehkan untuk mengosongkan kata kunci !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=Proses Instalasi telah selesai
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=Direkomendasikan untuk menggunakan direktori diluar dari direktori halaman web anda
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Telah ada
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Pemutakhiran
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Mulai
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Mohon perbaiki kesalahan dan tekan F5 untuk memuat ulang halaman
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Versi Database
 ServerVersion=Versi Server Database
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Proses migrasi selesai
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Proses Pemutakhiran berhasil
 MigrationUpdateFailed=Proses pemutakhiran gagal
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 54cceebcfef..4daf9dc8877 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 962d8984451..db3a88b9c1a 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Keterangan
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/id_ID/paybox.lang b/htdocs/langs/id_ID/paybox.lang
index a5362fea034..2b333fd2181 100644
--- a/htdocs/langs/id_ID/paybox.lang
+++ b/htdocs/langs/id_ID/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
index 3e6954e4f49..e6c90630ef8 100644
--- a/htdocs/langs/id_ID/propal.lang
+++ b/htdocs/langs/id_ID/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Konsep
-PropalStatusValidatedShort=Divalidasi
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Ditutup
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index babb269074b..dcaec1b62b7 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Lögun fatlaður í kynningu
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-einingar verkfæri
 ModuleFamilyExperimental=Experimental mát
 ModuleFamilyFinancial=Financial einingar (Bókhald / ríkissjóðs)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Valmynd dýraþjálfari
 MenuAdmin=Valmynd ritstjóri
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Notendur & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Fyrirtæki og stjórnun tengiliðs
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Auglýsing
 Module2Desc=Auglýsing stjórnun
 Module10Name=Bókhald
@@ -501,7 +501,7 @@ Module23Desc=Eftirlit með notkun orku
 Module25Name=Viðskiptavinur Pantanir
 Module25Desc=Viðskiptavinur röð er stjórnun
 Module30Name=Kvittanir
-Module30Desc=Reikninga og stjórnun kredit athugið fyrir viðskiptavini. Invoice's stjórnun fyrir birgja
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Birgjar
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VSK Verð
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Greiðsla skilyrði
 DictionaryPaymentModes=Greiðsla stillingar
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (raf-og rafeindabúnaðarúrgang)
 DictionaryPaperFormat=Pappír snið
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Merki notaður við vanræksla, ef ekki þýðingu er að finna í kóða
 LabelOnDocuments=Merki um skjöl
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Í lok mánaðar
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Öryggi endurskoðun viðburðir
-Audit=Úttekt
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Listi yfir Dolibarr öryggi viðburðir
 SecurityEventsPurged=Öryggi viðburðir hreinsa
-LogEventDesc=Þú getur gert hér skráir þig inn Dolibarr öryggi viðburðir. Stjórnandi getur þá sjá efni þess í gegnum valmynd <b>System verkfæri - endurskoðun.</b> Aðvörun, getur þessi eiginleiki neyta mikið af gögnum í gagnagrunninum.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú færð í lesa aðeins háttur og sýnileg Aðeins kerfisstjórar.
 SystemAreaForAdminOnly=Þetta svæði er í boði fyrir notendur stjórnandi aðeins. Ekkert af Dolibarr leyfi getur dregið þessi mörk.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Hrein einingaverð vöru
 TotalPriceAfterRounding=Samtals verð (net / VSK / incl skatt) eftir lokið máli mínu
 ParameterActiveForNextInputOnly=Breytu gildi fyrir næsta inntak aðeins
-NoEventOrNoAuditSetup=Nei öryggi atburður hefur verið skráð enn. Þetta getur verið eðlilegt ef endurskoðun hefur ekki verið virkt á "skipulag - öryggi - endurskoðun" síðunni.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Sjá sveitarfélaga sendmail uppsetningu
 BackupDesc=Til að ljúka öryggisafrit af Dolibarr, verður þú að:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index 6e9c427c3f9..8047926cc58 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -7,7 +7,7 @@ BankName=Nafn banka
 FinancialAccount=Reikningur
 BankAccount=Bankanúmer
 BankAccounts=Bankareikningar
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial reikning dómari
 AccountLabel=Financial reikning merki
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Reikningur heimilisfang
 BankAccountCountry=Reikningur landi
 BankAccountOwner=Eigandi reiknings Nafn
 BankAccountOwnerAddress=Eigandi reiknings Heimilisfang
-RIBControlError=Heiðarleiki athuga gildi ekki. Þetta þýðir fyrir þennan reikning númer eru ekki lokið eða rangt (athugaðu landið, tölur og IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Búa til reikning
 NewBankAccount=Nýr reikningur
 NewFinancialAccount=New fjármagnsjöfnuði
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Hægt að sættast
 Conciliate=Samræmdu
 Conciliation=Sættir
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Hafa loka reikningum
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Millifærslu
 BankTransfers=Millifærslur
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Frá
 TransferTo=Til að
 TransferFromToDone=A flytja <b>úr %s  í %s  af %s %</b> s hefur verið skráð.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank eftirlit
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Sýna athuga innborgun berst
-NumberOfCheques=ATH eftirlit
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Til baka á reikning
 ShowAllAccounts=Sýna allra reikninga
-FutureTransaction=Færsla í futur. Engin leið til leitar sátta.
-SelectChequeTransactionAndGenerate=Select / sía ávísanir til fela í innborgun stöðva móttöku og smelltu á &quot;Create.&quot;
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 760a6bf1fba..ae063e260ae 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma reikning
 InvoiceProFormaDesc=<b>Proforma reikningur</b> með mynd af a sannur reikning en hefur engar bókhalds gildi.
 InvoiceReplacement=Skipti reikningi
 InvoiceReplacementAsk=Skipti reikning fyrir reikning
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit athugið
 InvoiceAvoirAsk=Credit athugið að leiðrétta reikning
-InvoiceAvoirDesc=<b>Kredit huga</b> er neikvæð Reikningar notuð til að leysa þá staðreynd að reikningur hefur sú upphæð sem er mismunandi en upphæð raunverulega greitt (vegna þess að viðskiptavinur greiða of mikið við villa, eða er ekki greidd að fullu síðan hann kom aftur sum vara til dæmis).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Eyða greiðslu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Birgjar greiðslur
 ReceivedPayments=Móttekin greiðslur
 ReceivedCustomersPayments=Greiðslur sem berast frá viðskiptavinum
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Móttekin viðskiptavinum greiðslur til að sannreyna
 PaymentsReportsForYear=Greiðslur skýrslur fyrir %s
 PaymentsReports=Greiðslur skýrslur
@@ -91,8 +91,8 @@ PaymentConditionsShort=Greiðsla skilyrði
 PaymentAmount=Upphæð greiðslu
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Greiðsla hærri en áminning að borga
-HelpPaymentHigherThanReminderToPay=Attention, greiðslu magn af einni eða fleiri reikninga er hærra en annars staðar til að borga. <br> Breyta færslu þína staðfesta annað og hugsa um að búa til kredit mið af umfram fengið fyrir hverja overpaid reikninga.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Flokka 'Greiddur'
 ClassifyPaidPartially=Flokka 'Greiddur hluta'
 ClassifyCanceled=Flokka 'Yfirgefinn'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Loka (launalaust)
 BillStatusClosedPaidPartially=Greiddur (að hluta)
 BillShortStatusDraft=Víxill
 BillShortStatusPaid=Greiddur
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Greiddur
 BillShortStatusCanceled=Yfirgefin
 BillShortStatusValidated=Staðfestar
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Loka
 BillShortStatusClosedPaidPartially=Greiddur (að hluta)
 PaymentStatusToValidShort=Til að sannprófa
-ErrorVATIntraNotConfigured=Intracommunautary VSK númer ekki enn skilgreint
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Engar greiðslur sjálfgefna stillingu skilgreind. Fara til reiknings mát skipulag til festa this.
 ErrorCreateBankAccount=Stofna bankareikning, þá fara til Skipulag pallborð af Invoice mát til að skilgreina greiðslu stillingar
 ErrorBillNotFound=Invoice %s  er ekki til
-ErrorInvoiceAlreadyReplaced=Villa, þú reyna til setja í gildi um reikning til að skipta um reikning %s . En þetta eitt hefur þegar verið skipt út af% Reikningar s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Villa, afslátt þegar notaður
 ErrorInvoiceAvoirMustBeNegative=Villa, leiðrétta reikning verður að hafa neikvæð upphæð
 ErrorInvoiceOfThisTypeMustBePositive=Villa, this tegund af reikningi þarf að hafa jákvæð upphæð
 ErrorCantCancelIfReplacementInvoiceNotValidated=Villa, get ekki hætt við reikning sem hefur verið skipt út fyrir annan reikning sem er enn í stöðu drög
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Frá
 BillTo=Senda á
 ActionsOnBill=Actions reikning
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad viðskiptavina
 ConfirmClassifyPaidPartiallyReasonProductReturned=Vörur aftur að hluta
 ConfirmClassifyPaidPartiallyReasonOther=Upphæð yfirgefin fyrir annarri ástæðu
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Þetta val er mögulegt ef reikningurinn hafi verið veitt með viðeigandi athugasemd. (Dæmi «Aðeins skatta sem svarar til verðs sem hafa verið reyndar greiddur veitir rétt til frádráttar»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Í sumum löndum, þetta val gæti verið mögulegt ef reikningurinn inniheldur réttar Ath.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Notaðu þetta val ef allar aðrar ekki föt
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>slæmur viðskiptavinur</b> er a viðskiptavinur sem neita að borga skuldir hans.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Þetta val er notaður þegar greiðsla er ekki lokið vegna þess að sum vara voru aftur
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Notaðu þetta val ef allar aðrar ekki málið, til dæmis í eftirfarandi aðstæðum: <br> - Greiðsla ekki lokið vegna þess að sum vara voru send til baka <br> - Upphæð hélt líka mikilvægt vegna þess að afsláttur var gleymt <br> Í öllum tilvikum, magn yfir-krafa verður að leiðrétta í kerfinu bókhalds því að búa til kredit nóta.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Önnur
 ConfirmClassifyAbandonReasonOtherDesc=Þetta val mun vera notað í öllum öðrum tilvikum. Til dæmis vegna þess að þú ætlar að búa til skipta reikningi.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Staðfesta Reikningar
 UnvalidateBill=Unvalidate reikning
-NumberOfBills=NB af reikningum
-NumberOfBillsByMonth=Nb reikninga eftir mánuði
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Upphæð á reikningi
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Upphæð á reikningi eftir mánuði (eftir skatta)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Sýna reikning
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Viðskiptavinur reikninga og línur reiknings er
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Viðskiptavinur reikninga og greiðslur
-ExportDataset_invoice_1=Viðskiptavinur reikningum lista og línur reiknings er
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Viðskiptavinur reikninga og greiðslur
 ProformaBill=Proforma Bill:
 Reduction=Minnkun
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill heimilisfang
-HelpEscompte=Þessi afsláttur er afsláttur veittur til viðskiptavina vegna greiðslu þess var áður litið.
-HelpAbandonBadCustomer=Þessi upphæð hefur verið yfirgefin (viðskiptavinur til vera a slæmur viðskiptavina) og er talið að sérstakar lausir.
-HelpAbandonOther=Þessi upphæð hefur verið yfirgefin síðan það var villa (vitlaust viðskiptavinar eða reikning í stað með öðrum til dæmis)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Greiðsla persónuskilríki
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Engin reikningur valinn
 CloneInvoice=Klóna Reikningar
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Aðgerð fatlaður vegna þess að reikningur hefur verið skipt
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=ATH greiðslna
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split afslátt í tvö
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Inntak upphæð fyrir hverja tvo hluta:
-TotalOfTwoDiscountMustEqualsOriginal=Samtals tvö ný afsláttur verður jafn upprunaleg afsláttur upphæð.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Svipaðir Reikningar
 RelatedBills=Svipaðir reikningum
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Athuga
 PaymentTypeShortCHQ=Athuga
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Á línunni greiðslu
-PaymentTypeShortVAD=Á línunni greiðslu
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Drög
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bankaupplýsingar
 BankCode=Bankakóði
-DeskCode=Skrifborð kóða
+DeskCode=Office code
 BankAccountNumber=Reikningsnúmer
-BankAccountNumberKey=Lykill
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN númer
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT númer
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Greiðslu með millifærslu á eftirfarandi b
 VATIsNotUsedForInvoice=* Non viðeigandi VSK-list-293B af CGI
 LawApplicationPart1=Með því að beita lögum 80,335 af 12/05/80
 LawApplicationPart2=vöruna enn eign
-LawApplicationPart3=seljanda þar til lokið gjaldkeri af
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=verð þeirra.
 LimitedLiabilityCompanyCapital=SARL með höfuðborg
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Eftirlit
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Nota viðskiptavina greiðanda Heimilisfang staðinn þriðja aðila netfang sem viðtakandi fyrir reikningum
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Sýna alla ógreiddra reikninga
 ShowUnpaidLateOnly=Sýna seint ógreiddum reikningi aðeins
 PaymentInvoiceRef=Greiðsla Reikningar %s
@@ -474,21 +476,22 @@ Reported=Seinkun
 DisabledBecausePayments=Ekki hægt þar sem það er einhvers greiðslur
 CantRemovePaymentWithOneInvoicePaid=Get ekki fjarlægt greiðslu þar er að minnsta kosti á reikning flokkast borgað
 ExpectedToPay=Væntanlegur greiðslu
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Borgað af þessari greiðslu
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu &quot;borgað&quot;.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice líkan Crabe. A heill Reikningar líkan (styður VSK valkostur, afslætti, greiðslur skilyrði, merki, osfrv ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 8628470e895..3d11712f2e8 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Sýna fyrirtæki
 ShowStock=Sýna vöruhús
 DeleteArticle=Smelltu til að fjarlægja þessa grein
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Benda á sölu
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang
index e01a89dc3d3..640def520a2 100644
--- a/htdocs/langs/is_IS/commercial.lang
+++ b/htdocs/langs/is_IS/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Símtal
 ActionAC_FAX=Senda símbréfi
 ActionAC_PROP=Senda tillögu með tölvupósti
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Fundir
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Senda viðskiptavinur reikning í pósti
@@ -72,8 +73,8 @@ StatusProsp=Prospect stöðu
 DraftPropals=Drög auglýsing tillögur
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/is_IS/dict.lang b/htdocs/langs/is_IS/dict.lang
index 1dc35ef040d..0def5cf30a7 100644
--- a/htdocs/langs/is_IS/dict.lang
+++ b/htdocs/langs/is_IS/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard-eyjar og McDonald
 CountryVA=Páfagarði (Vatican City State)
 CountryHN=Hondúras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Indland
 CountryID=Iceland
 CountryIR=Íran
@@ -131,7 +131,7 @@ CountryKI=Kíribatí
 CountryKP=Norður-Kórea
 CountryKR=Suður-Kórea
 CountryKW=Kúveit
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Lettland
 CountryLB=Líbanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongólía
 CountryMS=Montserrat
 CountryMZ=Mósambík
-CountryMM=Birmania (Burma)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibía
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trínidad og Tóbagó
 CountryTR=Tyrkland
 CountryTM=Turkmenistan
-CountryTC=Turks og Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Túvalú
 CountryUG=Úganda
 CountryUA=Úkraína
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rúpíur
 CurrencySingMUR=Mauritius rúpíur
 CurrencyNOK=Norska krones
-CurrencySingNOK=Norsk króna
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian denari
 CurrencyUSD=US dollarar
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index c8d3d6fc5cb..b91336dc4a6 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=ATH gagna í möppu
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Listinn
 ECMSectionManual=Handbók skrá
 ECMSectionAuto=Sjálfvirk skrá
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Engin skrá búin til
 ShowECMSection=Sýna skrá
 DeleteSection=Fjarlægja möppu
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 01e24aa1b81..0d03520055a 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/is_IS/help.lang b/htdocs/langs/is_IS/help.lang
index 4d21ae44b0b..917a3523612 100644
--- a/htdocs/langs/is_IS/help.lang
+++ b/htdocs/langs/is_IS/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online rauntíma / fjarlægur styðja
 OtherSupport=Annar stuðningur
 ToSeeListOfAvailableRessources=Til að hafa samband / sjá lista yfir auðlindir:
 HelpCenter=Hjálparmiðstöð AdWords
-DolibarrHelpCenter=Dolibarr aðstoð og stuðning sent
-ToGoBackToDolibarr=Annars skaltu smella <a href="%s">hér til að nota Dolibarr</a>
-TypeOfSupport=Heimild stuðning
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Samfélag (frítt)
 TypeSupportCommercial=Auglýsing
 TypeOfHelp=Tegund
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Nýtni
 TypeHelpOnly=Hjálp aðeins
 TypeHelpDev=Hjálp + Development
-TypeHelpDevForm=Hjálp + Þróun + Myndun
-ToGetHelpGoOnSparkAngels1=Sum fyrirtæki geta afla a fljótur (stundum strax) og skilvirkari netinu styðja með því að taka stjórn á tölvunni þinni. Slík framreiðslu má finna <b>á %s </b> vefur staður:
-ToGetHelpGoOnSparkAngels3=Þú getur líka farið til lista yfir alla tiltæka þjálfarar fyrir Dolibarr, því að smella á hnappinn
-ToGetHelpGoOnSparkAngels2=Stundum er ekkert fyrirtæki sem til eru um þessar mundir þú gera leitina, hugsa svo til að breyta síu til að leita að "allar upplýsingar". Þú verður að vera fær um að senda fleiri beiðnir.
-BackToHelpCenter=Annars skaltu smella hér til að fara <a href="%s">til baka til að hjálpa miðstöð heimasíðu</a> .
-LinkToGoldMember=Þú getur hringt í einn þjálfara preselected eftir Dolibarr fyrir þitt tungumál ( %s ) með því að smella Búnaður hans (staða og hámarksverð eru sjálfkrafa uppfærðar):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Styður tungumálum
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index 381744c546d..2f77fbcbe16 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Upphafsdagur
 DateFinCP=Lokadagur
@@ -15,13 +15,18 @@ ApprovedCP=Samþykkt
 CancelCP=Hætt við
 RefuseCP=Neitaði
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Lýsing
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Breyta
 DeleteCP=Eyða
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Ástæða
 UserCP=Notandi
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index b9b09c6d06b..946f3a814cc 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Fylgdu leiðbeiningunum skref fyrir skref.
 MiscellaneousChecks=Undanfarar stöðva
 ConfFileExists=Stillingar <b>skrá %s </b> til.
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>Stillingar %s  er</b> ekki til og gat ekki búið til!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=<b>Stillingarskráin %s </b> getur verið búinn til.
-ConfFileIsNotWritable=<b>Stillingarskráin %s </b> er ekki rétta aðgangsheimild. Athugaðu heimildir. Fyrir fyrsta sett verður upp á netþjóninn þinn verði veitt til að geta skrifað inn í þessa mynd á ferli stillingar ("chmod 666" til dæmis á Unix eins og OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=<b>Stillingarskráin %s </b> er writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload allar upplýsingar úr skrá stillingu.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Þetta PHP styður fundur.
 PHPSupportPOSTGETOk=Þetta PHP styður breytur POST og FÁ.
-PHPSupportPOSTGETKo=Það er hægt PHP skipulag þinn styður ekki breytur POST og / eða FÁ. Athugaðu <b>variables_order</b> þinn breytu í php.ini.
-PHPSupportGD=Þetta PHP stuðning GD grafísku aðgerðir.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Þetta PHP stuðning UTF8 virka.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max fundur minnið er stillt <b>á %s .</b> Þetta ætti að vera nóg.
-PHPMemoryTooLow=Your PHP max fundur minnið er stillt <b>á %s </b> bæti. Þetta ætti að vera of lág. Breyta <b>php.ini</b> þinn til að stilla <b>memory_limit</b> breytu til að minnsta <b>kosti %s </b> bæti.
-Recheck=Smelltu hér til að fá fleiri significative próf
-ErrorPHPDoesNotSupportSessions=PHP uppsetningu þinn styður ekki fundur. Þessi eiginleiki er nauðsynlegt til að gera Dolibarr vinna. Athugaðu PHP uppsetningu þína.
-ErrorPHPDoesNotSupportGD=PHP uppsetningu þinn styður ekki myndrænt fall GD. Nei línurit verður í boði.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=PHP uppsetningu þinn styður ekki UTF8 virka. Dolibarr get ekki virka rétt. Leysa þetta áður installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Listinn %s  er ekki til.
-ErrorGoBackAndCorrectParameters=Fara aftur á bak og leiðrétta rangar breytur.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Þú gætir hafa slegið rangt gildi fyrir breytu ' %s '.
 ErrorFailedToCreateDatabase=Ekki tókst að búa til gagnagrunn ' %s '.
 ErrorFailedToConnectToDatabase=Tókst ekki að tengjast við gagnagrunn ' %s '.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP útgáfa of gamall. Útgáfa %s  er krafist.
-ErrorConnectedButDatabaseNotFound=Tenging við miðlara árangri en %s  gagnagrunninum 'fannst ekki.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=%s  Database 'er þegar til.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ef gagnagrunnur er ekki til, farðu til baka og athuga möguleika á "Búa til gagnagrunn".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ef skráð er þegar til, farðu til baka og veljið "Create gagnagrunninum" valmöguleikann.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using leyfi
 ConfigurationFile=Stillingar skrá
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Gagnasafn
 DatabaseType=Gagnasafn tegund
 DriverType=Bílstjóri tegund
 Server=Server
-ServerAddressDescription=Nafn eða ip tölu fyrir framreiðslumaður gagnasafn, venjulega 'localhost' þegar gagnasafn framreiðslumaður er hýst á sama miðlara en vefþjóninum
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Gagnasafn framreiðslumaður höfn. Halda tómur ef ekki þekkt.
 DatabaseServer=Gagnasafn miðlara
 DatabaseName=Gagnasafn nafn
-DatabasePrefix=Gagnasafn forskeyti borð
-AdminLogin=Innskráning fyrir Dolibarr gagnasafn eigandi.
-PasswordAgain=Sláðu lykilorðið inn aftur í annað sinn
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Lykilorð fyrir Dolibarr gagnasafn eigandi.
 CreateDatabase=Búa til gagnasafn
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Gagnasafn framreiðslumaður - Ofurpaur aðgang
-CheckToCreateDatabase=Hakaðu í reitinn ef gagnagrunnur er ekki til og því þarf að skapa. <br> Í þessum tilfellum verður þú að fylla tenging / lykilorð til Ofurpaur reikning neðst á þessari síðu.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Innskráning á notanda leyft að búa til nýja gagnagrunna eða nýr notandi, gagnslaus ef gagnasafninu og gagnasafn innskráningu þegar til (eins og þegar þú ert haldin af vefþjónusta fyrir hendi).
-KeepEmptyIfNoPassword=Leyfi tómur ef notandi hefur ekki aðgangsorð (forðast þetta)
-SaveConfigurationFile=Vista gildi
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server tengingu
 DatabaseCreation=Gagnasafn sköpun
 CreateDatabaseObjects=Gagnasafn mótmæla stofnun
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Búa til erlendra lykla og Vísitölur fyrir% borð s
 OtherKeysCreation=Erlend lykla og Vísitölur sköpun
 FunctionsCreation=Aðgerðir sköpun
 AdminAccountCreation=Administrator Innskráning sköpun
-PleaseTypePassword=Vinsamlega skrifaðu inn lykilorð, er tómt lykilorð ekki leyft!
-PleaseTypeALogin=Vinsamlega skrifaðu inn notandanafn!
-PasswordsMismatch=Lykilorð ólík, vinsamlegast reyndu aftur!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Lok skipulag
 SystemIsInstalled=Þessi uppsetning er lokið.
 SystemIsUpgraded=Dolibarr hefur verið uppfærð með góðum árangri.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Þú þarft að stilla Dolibarr til föt þinn af nau
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Fara til Dolibarr
 GoToSetupArea=Fara til Dolibarr (skipulag svæði)
-MigrationNotFinished=Útgáfa af gagnagrunni er ekki alveg upp til dagsetning, svo þú verður að keyra uppfærslu ferlið aftur.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Fara til uppfærsla síðu aftur
 WithNoSlashAtTheEnd=Án rista "/" í lok
-DirectoryRecommendation=Það er recommanded að nota skrá utan möppuna á vefsíðum þínum.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Þegar til
 DolibarrAdminLogin=Dolibarr admin Innskráning
-AdminLoginAlreadyExists=reikningur <b>' %s </b> Dolibarr stjórnandi' er þegar til.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Aðvörun, vegna öryggis, þegar setja upp eða uppfæra er heill, þá ættir þú að fjarlægja <b>setja möppu eða gefa henni nýtt heiti með hana til install.lock í því skyni að koma í veg fyrir notkun þess illgjarn.</b>
-FunctionNotAvailableInThisPHP=Ekki í boði á þessari PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Veldu fólksflutninga handrit
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script vinnslu
 ChooseYourSetupMode=Veldu uppsetningu háttur þinn og smelltu á "Start" ...
 FreshInstall=Fresh setja
-FreshInstallDesc=Notaðu þessa stillingu ef þetta er þinn fyrstur setja. Ef ekki, this háttur getur viðgerð á ófullnægjandi fyrri uppsetningum, en ef þú vilt uppfæra þína útgáfu, veldu "Upgrade" ham.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Uppfærsla
 UpgradeDesc=Notaðu þessa stillingu ef þú hefur skipt út gömlum Dolibarr skrár með skrá úr nýrri útgáfu. Þetta mun uppfæra gagnagrunninn og gögn.
 Start=Byrja
 InstallNotAllowed=Skipulag leyfa ekki með leyfi <b>conf.php</b>
 YouMustCreateWithPermission=Þú verður að búa til skrána %s  og setja skrifa leyfi á það fyrir vefþjón á meðan setja ferli.
-CorrectProblemAndReloadPage=Vinsamlegast lagaðu vandamál og ýta á F5 til að endurhlaða síðunni.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Þegar flytja
 DatabaseVersion=Gagnasafn útgáfa
 ServerVersion=Gagnasafn framreiðslumaður útgáfa
 YouMustCreateItAndAllowServerToWrite=Þú verður að búa til þessa möppu og gera ráð fyrir the vefur framreiðslumaður að skrifa inn í það.
 DBSortingCollation=Eðli flokkun þess
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Þú biður að búa til <b>gagnasafn %s ,</b> en fyrir þetta, Dolibarr þarf til að tengjast við <b>miðlara %s </b> með frábær <b>notanda %s </b> aðgangsheimildir.
-YouAskLoginCreationSoDolibarrNeedToConnect=Þú biður að búa til gagnasafn <b>innskráningu %s ,</b> en fyrir þetta, Dolibarr þarf til að tengjast við <b>miðlara %s </b> með frábær <b>notanda %s </b> aðgangsheimildir.
-BecauseConnectionFailedParametersMayBeWrong=Eins og tengingin tókst ekki, vélar eða frábær breytur notandinn þarf að vera rangt.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Munaðarlaus greiðslu uppgötva af% aðferð s
 RemoveItManuallyAndPressF5ToContinue=Fjarlægja hana handvirkt og ýta á F5 til að halda áfram.
 FieldRenamed=Field endurnefna
-IfLoginDoesNotExistsCheckCreateUser=Ef tenging er ekki til enn, verður þú að athuga möguleika á "Búa til notanda"
-ErrorConnection=Server <b>" %s ",</b> gagnasafn nafn <b>" %s ",</b> tenging <b>" %s ",</b> eða gagnasafn lykilorð kann að vera rangt eða PHP viðskiptavinur útgáfa getur verið of gömul miðað við gagnagrunn útgáfa.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Mælt val til setja í embætti <b>útgáfa %s  er%</b> þín núverandi útgáfa <b>s</b>
 InstallChoiceSuggested=<b>Setja val leiðbeinandi við embætti.</b>
-MigrateIsDoneStepByStep=Sem miðað útgáfa (%s) hefur skarð af nokkrum útgáfum, svo setja töframaður mun koma aftur að stinga upp á næsta fólksflutningum þegar þetta verður lokið.
-CheckThatDatabasenameIsCorrect=Athugaðu að gagnagrunnur nafn <b>" %s "</b> er rétt.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Ef þetta nafn sé rétt og að gagnagrunnur er ekki til enn, þú verður að athuga möguleika á "Búa til gagnagrunn".
 OpenBaseDir=PHP openbasedir breytu
-YouAskToCreateDatabaseSoRootRequired=Þú hakað við reitinn "Búa til gagnagrunn". Fyrir þetta þarftu að gefa upp notendanafn / lykilorð Ofurpaur (neðst á mynd).
-YouAskToCreateDatabaseUserSoRootRequired=Þú hakað við reitinn "Búa til gagnagrunn eigandi". Fyrir þetta þarftu að gefa upp notendanafn / lykilorð Ofurpaur (neðst á mynd).
-NextStepMightLastALongTime=Núverandi skref getur varað í nokkrar mínútur. Vinsamlegast bíðið þangað til the næstur skjár birtist alveg áður en haldið er áfram.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Flytja skipum fyrir viðskiptavin pantanir geymslu
 MigrationShippingDelivery=Uppfærsla geymslu Sendingar
 MigrationShippingDelivery2=Uppfærsla geymslu siglinga 2
 MigrationFinished=Migration lokið
-LastStepDesc=<strong>Síðasta skref:</strong> Tilgreindu hér notandanafn og lykilorð sem þú ætlar að nota til að tengjast hugbúnaði. Ekki missa þetta eins og það er á reikningnum að gefa öllum öðrum.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Virkja mát %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=Þú notar Dolibarr skipulag töframaður frá DoliWamp, svo gildi lagt hér eru nú þegar bjartsýni. Breyta þeim aðeins ef þú veist hvað þú gerir.
-KeepDefaultValuesDeb=Þú notar Dolibarr skipulag töframaður frá Ubuntu eða Debian pakka, þannig gildi lagt hér eru nú þegar bjartsýni. Aðeins lykilorð gagnagrunninum eigandi að búa verður að vera lokið. Breyta aðrar breytur aðeins ef þú veist hvað þú gerir.
-KeepDefaultValuesMamp=Þú notar Dolibarr skipulag töframaður frá DoliMamp, svo gildi lagt hér eru nú þegar bjartsýni. Breyta þeim aðeins ef þú veist hvað þú gerir.
-KeepDefaultValuesProxmox=Þú notar Dolibarr uppsetningarhjálpina frá Proxmox raunverulegur tæki, svo gildi lagt hér eru nú þegar bjartsýni. Breyta þeim aðeins ef þú veist hvað þú gerir.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Gögn fólksflutninga í atvinnuskyni tillögur
 MigrationInvoice=Gögn fólksflutninga fyrir reikninga viðskiptavina
 MigrationContract=Gögn fólksflutninga til samninga
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Uppfærsla tókst
 MigrationUpdateFailed=Gat ekki uppfærsla aðferð
 MigrationRelationshipTables=Gögn fólksflutninga fyrir borð sambandið ( %s )
 MigrationPaymentsUpdate=Greiðsla gögn leiðrétting
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Samningur gögn leiðrétting
 MigrationContractsNumberToUpdate=%s  samningi (s) til að endurnýja
 MigrationContractsLineCreation=Búa til samninga lína fyrir samningur dómari %s
 MigrationContractsNothingToUpdate=Engin fleiri atriði sem þarf að gera
-MigrationContractsFieldDontExist=Field fk_facture er ekki til lengur. Ekkert að gera.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Samningur tóm dagsetningu leiðrétting
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Ekki samning tóm dagsetningu til að leiðrétta
 MigrationContractsEmptyCreationDatesNothingToUpdate=Engin sköpun samning dagsetningu til að leiðrétta
 MigrationContractsInvalidDatesUpdate=Bad gildi þann samning leiðrétting
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Afhending uppfæra
 MigrationStockDetail=Uppfæra lager gildi vöru
 MigrationMenusDetail=Uppfæra dynamic valmyndir töflur
 MigrationDeliveryAddress=Uppfæra skila inn í sendingar
-MigrationProjectTaskActors=Gögn fólksflutninga til llx_projet_task_actors borð
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Gögn fólksflutninga sviði fk_user_resp af llx_projet til llx_element_contact
 MigrationProjectTaskTime=Uppfæra tími í sekúndum
 MigrationActioncommElement=Uppfæra upplýsingar um aðgerðir
 MigrationPaymentMode=Gögn fólksflutninga í ham greiðslu
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index a4fdbbc7073..04f6df33ec0 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Tengiliðir / adresses fyrir þessa þriðja aðila
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Actions um þessa þriðja aðila
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Viðburðir um þennan notanda
 ActionsOnProduct=Events about this product
 NActionsLate=%s  seint
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 30a3ab82462..247ddedc5af 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Tengd mótmæla
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titill
 WEBSITE_DESCRIPTION=Lýsing
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/is_IS/paybox.lang b/htdocs/langs/is_IS/paybox.lang
index 6dd0039e522..564c87257c8 100644
--- a/htdocs/langs/is_IS/paybox.lang
+++ b/htdocs/langs/is_IS/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox mát skipulag
 PayBoxDesc=Þessi eining síður bjóða upp á til að heimila greiðslu á <a href="http://www.paybox.com" target="_blank">Paybox</a> við viðskiptavini. Þetta má nota til a frjáls greiðslu eða til greiðslu á tilteknum Dolibarr mótmæla (Reikningar, röð, ...)
 FollowingUrlAreAvailableToMakePayments=Eftirfarandi vefslóðir eru að bjóða upp síðu til viðskiptavina til að framkvæma greiðslu á Dolibarr mótmæla
 PaymentForm=Greiðsla mynd
-WelcomeOnPaymentPage=Velkomin á netinu greiðsluþjónustu okkar
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Þessi skjár leyfa þér að gera á netinu greiðslu til %s.
 ThisIsInformationOnPayment=Þetta eru upplýsingar um greiðslu að gera
 ToComplete=Til að ljúka
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL að bjóða upp á %s inni greiðslu n
 ToOfferALinkForOnlinePaymentOnContractLine=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir samning línu
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir ókeypis upphæð
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL að bjóða upp á %s inni greiðslu notandi tengi fyrir aðild áskrift
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Þú getur einnig bætt við url stika <b>& tag = <i>gildi</i></b> til allir af þessir URL (einungis fyrir frjáls greiðslu) til að bæta tag þína eigin greiðslu athugasemd.
-SetupPayBoxToHavePaymentCreatedAutomatically=Skipulag PayBox með url <b>%s</b> að hafa greiðslu búinn til sjálfkrafa þegar staðfest með því að paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Þessi síða staðfestir að greiðsla hefur verið skráð. Þakka þér.
-YourPaymentHasNotBeenRecorded=Þú greiðsla hefur ekki verið skráð og viðskipti hefur verið aflýst. Þakka þér.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Skráningin breytur
 UsageParameter=Notkun breytur
 InformationToFindParameters=Hjálp til að finna %s upplýsingar reiknings þíns
diff --git a/htdocs/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang
index 1d1a595e7dd..d2f2d108789 100644
--- a/htdocs/langs/is_IS/propal.lang
+++ b/htdocs/langs/is_IS/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Undirritað (þarf greiðanda)
 PropalStatusNotSigned=Ekki skráð (lokað)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Víxill
-PropalStatusValidatedShort=Staðfest
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Loka
 PropalStatusSignedShort=Innsigli
 PropalStatusNotSignedShort=Ekki skráð
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s  fannst ekki
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Búa auglýsing tillögu með því að afrita það sem tillaga
-CreateEmptyPropal=Búa til tóm auglýsing tillögur vierge eða lista yfir vörur / þjónustu
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default auglýsing tillögu Gildistími Lengd (í dögum)
-UseCustomerContactAsPropalRecipientIfExist=Nota viðskiptavina samband netfang ef skilgreint í stað þriðja aðila netfang sem tillaga viðtakanda heimilisfang
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klóna auglýsing tillögu
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Viðskiptavinur samband eftirfarandi upp ti
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A heill tillögu líkan (logo. ..)
+DocModelCyanDescription=A heill tillögu líkan (logo. ..)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 392ac3aed7a..090cda74d4f 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Lesa
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 5953844cb49..a0ddd796c0e 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funzione disabilitata in modalità demo
 FeatureAvailableOnlyOnStable=Feature disponibile solo nelle versioni stabili ufficiali
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Trova app/moduli esterni...
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Strumenti Multi-modulo
 ModuleFamilyExperimental=Moduli sperimentali
 ModuleFamilyFinancial=Moduli finanziari (Contabilità/Cassa)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites ed altre applicazioni
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfacce con sistemi esterni
 MenuHandlers=Gestori menu
 MenuAdmin=Editor menu
@@ -463,9 +463,9 @@ ClickToShowDescription=Clicca per mostrare la descrizione
 DependsOn=This module needs the module(s)
 RequiredBy=Questo modulo è richiesto dal modulo
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Abilita l'utilizzo di valori predefiniti personalizzati
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Utenti e gruppi
 Module0Desc=Gestione utenti/impiegati e gruppi
 Module1Name=Third Parties
-Module1Desc=Gestione aziende e contatti
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commerciale
 Module2Desc=Gestione commerciale
 Module10Name=Contabilità
@@ -501,7 +501,7 @@ Module23Desc=Monitoraggio del consumo energetico
 Module25Name=Ordini clienti
 Module25Desc=Gestione ordini clienti
 Module30Name=Fatture
-Module30Desc=Gestione Fatture e note di credito per i clienti. Gestione Fatture per i fornitori
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Fornitori
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Aliquote IVA o Tasse di vendita
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Termini di pagamento
 DictionaryPaymentModes=Modalità di pagamento
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotassa (WEEE)
 DictionaryPaperFormat=Formati di carta
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esiste la traduzione)
 LabelOnDocuments=Descrizione sul documento
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Alla fine del mese
 CurrentNext=Corrente/Successivo
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Eventi di audit di sicurezza
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Informazioni su Dolibarr
 InfoBrowser=Informazioni browser
 InfoOS=Informazioni OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser
 BrowserOS=Sistema operativo
 ListOfSecurityEvents=Elenco degli eventi di sicurezza Dolibarr
 SecurityEventsPurged=Eventi di sicurezza eliminati
-LogEventDesc=Qui è possibile attivare il registro eventi di sicurezza di Dolibarr. Gli amministratori possono quindi vederne il contenuto attraverso <b>Strumenti di sistema - Audit</b>. Attenzione, attivando questa funzione è possibile che venga scritta una grande quantità di dati nel database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=I parametri di setup possono essere definiti solo da utenti di tipo <b>amministratore</b>.
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=Questa sezione è disponibile solo agli utenti di tipo <b>amministratore</b>. Nessuna delle autorizzazioni disponibili può alterare questo limite.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Prezzo unitario netto di un prodotto
 TotalPriceAfterRounding=Prezzo totale (al netto dell'IVA/IVA inclusa) dopo l'arrotondamento
 ParameterActiveForNextInputOnly=Parametro valido esclusivamente per il prossimo inserimento
-NoEventOrNoAuditSetup=Nessun evento di sicurezza registrato. Questo può essere normale se non la registrazione non è stato attivata in <b>Impostazioni - sicurezza - controllo</b>.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Controllare le impostazioni locali del server di posta (sendmail)
 BackupDesc=Per effettuare un backup completo di Dolibarr è necessario:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Attributi complementari (terze parti)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Attributi Complementari (membri)
 ExtraFieldsMemberType=Attributi Complementari (tipo di membro)
 ExtraFieldsCustomerInvoices=Attributi aggiuntivi (fatture)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Lista notifiche per utente
 ListOfNotificationsPerUserOrContact=Lista di notifiche per utente o per contatto
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Soglia
 BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=CAP
 ##### Resource ####
 ResourceSetup=Configurazione del modulo Risorse
 UseSearchToSelectResource=Utilizza il form di ricerca per scegliere una risorsa (invece della lista a tendina)
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 041bc986a20..f1c1a7b2020 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -7,7 +7,7 @@ BankName=Nome della Banca
 FinancialAccount=Conto
 BankAccount=Conto bancario
 BankAccounts=Conti bancari
-BankAccountsAndGateways=Conti bancari | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Mostra conto
 AccountRef=Rif. conto
 AccountLabel=Etichetta conto
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Domiciliazione del conto
 BankAccountCountry=Paese del conto
 BankAccountOwner=Nome titolare
 BankAccountOwnerAddress=Indirizzo titolare
-RIBControlError=Controllo coordinate fallito. I dati del conto sono incompleti o sbagliati (controlla paese, codici e IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Crea conto
 NewBankAccount=Nuovo conto
 NewFinancialAccount=Nuovo conto finanziario
@@ -76,6 +76,7 @@ TransactionsToConciliate=Transazioni da conciliare
 Conciliable=Conciliabile
 Conciliate=Concilia transazione
 Conciliation=Conciliazione
+SaveStatementOnly=Save statement only
 ReconciliationLate=Riconciliazione in ritardo
 IncludeClosedAccount=Includi i conti chiusi
 OnlyOpenedAccount=Solo conti aperti
@@ -104,7 +105,7 @@ SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
 MenuBankInternalTransfer=Trasferimento interno
-TransferDesc=Trasferimento da un conto ad un altro, Dolibarr scriverà due record (uno di addebito nel conto di origine e uno di credito nel conto di destinazione), dello stesso importo. Per questa operazione verranno usate la stessa data e la stessa etichetta.
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
 BankChecks=Assegni bancari
 BankChecksToReceipt=Assegni in attesa di deposito
 ShowCheckReceipt=Mostra ricevuta di versamento assegni
-NumberOfCheques=Numero di assegni
+NumberOfCheques=No. of check
 DeleteTransaction=Elimina transazione
 ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
 ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
@@ -135,8 +136,8 @@ BankTransactionLine=Transazione bancaria
 AllAccounts=Tutte le banche e le casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
-FutureTransaction=Transazione futura. Non è possibile conciliare.
-SelectChequeTransactionAndGenerate=Seleziona gli assegni dar includere nella ricevuta di versamento e clicca su &quot;Crea&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG
 EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
 ToConciliate=Da conciliare?
@@ -153,7 +154,7 @@ RejectCheckDate=Data di restituzione dell'assegno
 CheckRejected=Assegno restituito
 CheckRejectedAndInvoicesReopened=Assegno restituito e fatture riaperte
 BankAccountModelModule=Modelli di documento per i conti bancari e le casse
-DocumentModelSepaMandate=Modello di documento per i mandati SEPA. Da utilizzare solamente per i paese appartenenti alla CEE
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template per la stampa delle informazioni relative al BAN
 NewVariousPayment=Nuovi pagamenti vari
 VariousPayment=Pagamenti vari
@@ -162,4 +163,6 @@ ShowVariousPayment=Mostra pagamenti vari
 AddVariousPayment=Aggiungi pagamenti vari
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=I tuoi mandati SEPA
-FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un addebito diretto alla tua banca. Da restituire firmata (scan del documento firmato) o via email.
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index cb8fe65a017..2d7aa23a78b 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -12,23 +12,23 @@ BillsLate=Ritardi nei pagamenti
 BillsStatistics=Statistiche fatture attive
 BillsStatisticsSuppliers=Statistiche fatture passive
 DisabledBecauseDispatchedInBookkeeping=Disabilitato perché la fattura è stata inviata alla contabilità
-DisabledBecauseNotLastInvoice=Disabilitato perché la fattura non è cancellabile. Alcune fatture sono state registrate dopo questa e si creerebbero errori nella sequenza di numerazione.
+DisabledBecauseNotLastInvoice=Disabilitato perché la fattura non è cancellabile. Alcune fatture sono state registrate dopo questa e si avrebbero errori nella sequenza di numerazione.
 DisabledBecauseNotErasable=Disabilitata perché impossibile da cancellare
 InvoiceStandard=Fattura Standard
 InvoiceStandardAsk=Fattura Standard
 InvoiceStandardDesc=Questo tipo di fattura è la fattura più comune.
-InvoiceDeposit=Nota d'accredito
-InvoiceDepositAsk=Nota d'accredito
-InvoiceDepositDesc=Questo tipo di fattura si crea quando una nota d'accredito viene ricevuta.
+InvoiceDeposit=Fattura d'acconto
+InvoiceDepositAsk=Fattura d'acconto
+InvoiceDepositDesc=Questo tipo di fattura viene usata quando si riceve un acconto.
 InvoiceProForma=Fattura proforma
 InvoiceProFormaAsk=Fattura proforma
 InvoiceProFormaDesc=La <b>fattura proforma</b> è uguale ad una fattura vera, ma non ha valore contabile.
 InvoiceReplacement=Fattura sostitutiva
 InvoiceReplacementAsk=Fattura sostitutiva
-InvoiceReplacementDesc=La <b>fattura sostitutiva</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è ancora stata chiusa, questa verrà automaticamente chiusa come "abbandonata".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Nota di credito
 InvoiceAvoirAsk=Nota di credito per correggere fattura
-InvoiceAvoirDesc=La <b>nota di credito</b> è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Crea una Nota Credito con le righe della fattura di origine.
 invoiceAvoirWithPaymentRestAmount=Crea nota di credito con il restante da pagare della fattura originale
 invoiceAvoirLineWithPaymentRestAmount=Crea nota di credito con il restante da pagare
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=nella valuta delle fatture
 PaidBack=Rimborsato
 DeletePayment=Elimina pagamento
 ConfirmDeletePayment=Vuoi davvero cancellare questo pagamento?
-ConfirmConvertToReduc=Vuoi trasformare questa nota di credito in uno sconto assoluto?<br/> L'importo di tale credito verrà salvato nello sconto assoluto del cliente e potrà essere utilizzato come sconto per una successiva fattura a questo cliente.
-ConfirmConvertToReducSupplier=Vuoi convertire %s in uno sconto assoluto?<br>L'importo verrà salvato tra tutti gli sconti e potrebbe essere utilizzato come sconto per una fattura attuale o futura di questo fornitore.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Pagamenti fornitori
 ReceivedPayments=Pagamenti ricevuti
 ReceivedCustomersPayments=Pagamenti ricevuti dai clienti
-PayedSuppliersPayments=Pagamenti effettuati ai fornitori
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Pagamenti ricevuti dai clienti da convalidare
 PaymentsReportsForYear=Report pagamenti per %s
 PaymentsReports=Report pagamenti
@@ -91,8 +91,8 @@ PaymentConditionsShort=Condizioni di pagamento
 PaymentAmount=Importo del pagamento
 ValidatePayment=Convalidare questo pagamento?
 PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare
-HelpPaymentHigherThanReminderToPay=Attenzione, l'importo del pagamento di una o più fatture è più elevato rispetto al dovuto.<br/> Modifica l'importo, oppure conferma e crea una nota di credito per la differenza riscossa.
-HelpPaymentHigherThanReminderToPaySupplier=Attenzione, l'importo del pagamento di una o più fatture è superiore al residuo da pagare. <br> Modifica l'importo, altrimenti conferma e crea una nota di credito per l'eccedenza pagata.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classifica come "pagata"
 ClassifyPaidPartially=Classifica come "parzialmente pagata"
 ClassifyCanceled=Classifica come "abbandonata"
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Chiusa (non pagata)
 BillStatusClosedPaidPartially=Pagata (in parte)
 BillShortStatusDraft=Bozza
 BillShortStatusPaid=Pagata
-BillShortStatusPaidBackOrConverted=Rimborsata o convertita
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Pagato
 BillShortStatusCanceled=Abbandonata
 BillShortStatusValidated=Convalidata
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Non riborsata
 BillShortStatusClosedUnpaid=Chiusa
 BillShortStatusClosedPaidPartially=Pagata (in parte)
 PaymentStatusToValidShort=Da convalidare
-ErrorVATIntraNotConfigured=Numero di partita IVA non ancora impostato
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Nessuna modalità di pagamento predefinita. Vai al modulo impostazione delle fatture per risolvere il problema.
 ErrorCreateBankAccount=Crea un conto bancario, quindi passa al modulo impostazione delle fatture per definire le modalità di pagamento
 ErrorBillNotFound=La fattura %s non esiste
-ErrorInvoiceAlreadyReplaced=Errore, si tenta di convalidare una fattura per sostituire la fattura %s. Ma questa è già stato sostituita dalla fattura %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Errore, sconto già utilizzato
 ErrorInvoiceAvoirMustBeNegative=Errore, la fattura a correzione deve avere un importo negativo
 ErrorInvoiceOfThisTypeMustBePositive=Errore, questo tipo di fattura deve avere importo positivo
 ErrorCantCancelIfReplacementInvoiceNotValidated=Errore, non si può annullare una fattura che è stato sostituita da un'altra fattura non ancora convalidata
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Questa parte o un'altra è già utilizzata in modo che la serie di sconti non possa essere rimossa.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Da
 BillTo=A
 ActionsOnBill=Azioni su fattura
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura <b>%s</b> i
 ConfirmCancelBill=Vuoi davvero annullare la fattura <b>%s</b>?
 ConfirmCancelBillQuestion=Perché vuoi classificare questa fattura come "abbandonata"?
 ConfirmClassifyPaidPartially=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagato"?
-ConfirmClassifyPaidPartiallyQuestion=La fattura non è stata pagata completamente. Per quale ragione vuoi chiudere questa fattura?
-ConfirmClassifyPaidPartiallyReasonAvoir=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sarà regolarizzata mediante nota di credito.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato effettuato entro il termine.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sullo sconto sarà recuperata senza nota di credito.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso
 ConfirmClassifyPaidPartiallyReasonProductReturned=Parziale restituzione di prodotti
 ConfirmClassifyPaidPartiallyReasonOther=Altri motivi
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Questa scelta è possibile se la fattura prevede la clausola di importi adeguabili. (Esempio «Solo l'imposta corrispondente al prezzo effettivamente pagato dà diritto alla deduzione»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In alcuni paesi, questa scelta potrebbe essere possibile solo se la fattura contiene la clausola adeguata.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Utilizzare questa scelta se tutte le altre opzioni sono inadeguate.
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>cattivo cliente</b> è un cliente che si rifiuta di pagare il suo debito.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Questa scelta viene utilizzata quando il pagamento non è completo perché alcuni dei prodotti sono stati restituiti
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizzare questa scelta se tutte le altre opzioni sono inadeguate, per esempio: <br/>- il pagamento non è completo, in quanto alcuni prodotti sono stati restituiti.<br/>- l'importo richiesto è troppo oneroso per essere trasformato in uno sconto.<br/>Per correttezza contabile dovrà essere emessa una nota di credito.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Altro
 ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura sostitutiva.
 ConfirmCustomerPayment=Confermare riscossione per <b>%s</b> %s?
@@ -200,16 +201,17 @@ ConfirmSupplierPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche.
 ValidateBill=Convalida fattura
 UnvalidateBill=Invalida fattura
-NumberOfBills=Numero di fatture
-NumberOfBillsByMonth=Numero di fatture per mese
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Importo delle fatture
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Importo delle fatture per mese (al netto delle imposte)
 ShowSocialContribution=Mostra imposte sociali/fiscali
 ShowBill=Visualizza fattura
 ShowInvoice=Visualizza fattura
 ShowInvoiceReplace=Visualizza la fattura sostitutiva
 ShowInvoiceAvoir=Visualizza nota di credito
-ShowInvoiceDeposit=Mostra note d'accredito
+ShowInvoiceDeposit=Mostra fattura d'acconto
 ShowInvoiceSituation=Mostra avanzamento lavori
 ShowPayment=Visualizza pagamento
 AlreadyPaid=Già pagato
@@ -260,9 +262,9 @@ Repeatables=Modelli
 ChangeIntoRepeatableInvoice=Converti in modello di fattura
 CreateRepeatableInvoice=Crea modello di fattura
 CreateFromRepeatableInvoice=Crea da modello di fattura
-CustomersInvoicesAndInvoiceLines=Fatture attive e righe di fattura
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Fatture attive e pagamenti
-ExportDataset_invoice_1=Elenco delle fatture attive e righe di fattura
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Fatture clienti e pagamenti
 ProformaBill=Fattura proforma:
 Reduction=Sconto
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Sconto clienti
 SupplierDiscounts=Vendors discounts
 BillAddress=Indirizzo di fatturazione
-HelpEscompte=Questo sconto è concesso al cliente perché il suo pagamento è stato effettuato prima del termine.
-HelpAbandonBadCustomer=Tale importo è stato abbandonato (cattivo cliente) ed è considerato come un abbandono imprevisto.
-HelpAbandonOther=Tale importo è stato abbandonato dal momento che è stato un errore (cliente errato o fattura sostituita da altra, per esempio)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Id imposte sociali/fiscali
 PaymentId=Id Pagamento
 PaymentRef=Rif. pagamento
@@ -322,21 +324,21 @@ CloneInvoice=Clona fattura
 ConfirmCloneInvoice=Sei sicuro di voler clonare la <b>fattura %s?</b>
 DisabledBecauseReplacedInvoice=Disabilitata perché la fattura è stata sostituita
 DescTaxAndDividendsArea=Questa area riporta un riepilogo di tutti i pagamenti effettuati per spese straordinarie. Qui sono inclusi tutti i pagamenti registrati durante l'anno impostato.
-NbOfPayments=Numero pagamenti
+NbOfPayments=No. of payments
 SplitDiscount=Dividi lo sconto in due
-ConfirmSplitDiscount=Vuoi davvero dividere questo sconto <b>del %s %s</b> in 2 sconti inferiori?
-TypeAmountOfEachNewDiscount=Importo in input per ognuna delle due parti:
-TotalOfTwoDiscountMustEqualsOriginal=Il totale di due nuovi sconti deve essere pari allo sconto originale.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Vuoi davvero eliminare questo sconto?
 RelatedBill=Fattura correlata
 RelatedBills=Fatture correlate
 RelatedCustomerInvoices=Fatture attive correlate
 RelatedSupplierInvoices=Fatture passive correlate
 LatestRelatedBill=Ultima fattura correlata
-WarningBillExist=Attenzione, una o più fatture già esistenti
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Strumento di fusione dei PDF
 AmountPaymentDistributedOnInvoice=Importo del pagamento distribuito in fattura
-PaymentOnDifferentThirdBills=Consenti pagamenti su diverse fatture di terze parti ma appartenenti alla stessa società madre
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Nota di pagamento
 ListOfPreviousSituationInvoices=Elenco delle fatture di avanzamento lavori precedenti
 ListOfNextSituationInvoices=Elenco delle prossime fatture di avanzamento lavori
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Assegno
 PaymentTypeShortCHQ=Assegno
 PaymentTypeTIP=TIP (Documenti contro pagamenti)
 PaymentTypeShortTIP=TIP pagamenti
-PaymentTypeVAD=Pagamento on-line
-PaymentTypeShortVAD=Pagamen. online
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Assegno circolare
 PaymentTypeShortTRA=Assegno circolare
 PaymentTypeFAC=Fattore
 PaymentTypeShortFAC=Fattore
 BankDetails=Dati banca
 BankCode=ABI
-DeskCode=CAB
+DeskCode=Office code
 BankAccountNumber=C.C.
-BankAccountNumberKey=CIN
+BankAccountNumberKey=Check digits
 Residence=Domiciliazione
-IBANNumber=Codice IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=Codice BIC/SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Pagamenti tramite bonifico sul seguente C. C.
 VATIsNotUsedForInvoice=* Non applicabile IVA art-293B del CGI
 LawApplicationPart1=Con l'applicazione della legge 80.335 del 12/05/80
 LawApplicationPart2=I beni restano di proprietà della
-LawApplicationPart3=il venditore fino alla completa riscossione
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=del loro prezzo.
 LimitedLiabilityCompanyCapital=SRL con capitale di
 UseLine=Applica
@@ -463,7 +465,7 @@ Cheques=Assegni
 DepositId=ID deposito
 NbCheque=Numero di assegni
 CreditNoteConvertedIntoDiscount=Questo %s è stato convertito in %s
-UsBillingContactAsIncoiveRecipientIfExist=Utilizza l'indirizzo del contatto associato alla fattura come indirizzo di fatturazione invece di quello impostato per l'azienda
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Mostra tutte le fatture non pagate
 ShowUnpaidLateOnly=Visualizza solo fatture con pagamento in ritardo
 PaymentInvoiceRef=Pagamento fattura %s
@@ -474,21 +476,22 @@ Reported=Segnalato
 DisabledBecausePayments=Impossibile perché ci sono dei pagamenti
 CantRemovePaymentWithOneInvoicePaid=Impossibile rimuovere il pagamento. C'è almeno una fattura classificata come pagata
 ExpectedToPay=Pagamento previsto
-CantRemoveConciliatedPayment=Impossibile eliminare il pagamento conciliato
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Pagato con questo pagamento
-ClosePaidInvoicesAutomatically=Classifica come "Pagata" tutte le fatture, le note d'addebitoo le note di credito interamente pagate.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
-ClosePaidContributionsAutomatically=Classificare "Pagato" tutti i contributi sociali o fiscali interamente versati.
-AllCompletelyPayedInvoiceWillBeClosed=Tutte le fatture totalmente pagate saranno automaticamente chiuse allo stato "Pagato".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Paga
 ToMakePaymentBack=Rimborsa
 ListOfYourUnpaidInvoices=Elenco fatture non pagate
 NoteListOfYourUnpaidInvoices=Nota: questo elenco contiene solo fatture che hai collegato ad un rappresentante.
 RevenueStamp=Marca da bollo
-YouMustCreateInvoiceFromThird=Questa opzione è disponibile solo per la creazione di una fattura dalla maschera "cliente" del soggetto terzo.
-YouMustCreateInvoiceFromSupplierThird=Questa opzione è disponibile solo quando si crea la fattura dalla scheda "fornitore" del soggetto terzo
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Per creare un nuovo modelo bisogna prima creare una fattura normale e poi convertirla.
 PDFCrabeDescription=Modello di fattura Crabe. (Modello raccomandatoi)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Modello di fattura Crevette. Template completo per le fatture (Modello raccomandato)
 TerreNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn per le fatture, %syymm-nnnn per le note di credito e %syymm-nnnn per i versamenti, dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
 MarsNumRefModelDesc1=restituisce un numero nel formato %saamm-nnnn per fatture standard, %syymm-nnnn per le fatture sostitutive, %syymm-nnnn per le note d'addebito e %syymm-nnnn per le note di credito dove yy sta per anno, mm per mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
@@ -533,7 +536,7 @@ invoiceLineProgressError=L'avanzamento della riga fattura non può essere maggio
 updatePriceNextInvoiceErrorUpdateline=Errore: aggiornamento prezzo della riga di fattura: %s
 ToCreateARecurringInvoice=Per creare una fattura ricorrente per questo contratto, creare inizialmente la bozza di fattura, poi convertirla in un modello di fattura e definire quindi la frequenza di generazione delle future fatture.
 ToCreateARecurringInvoiceGene=Per generare regolarmente e manualmente le prossime fatture, basta andare sul menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Se è necessario che tali fatture vengano generate automaticamente, chiedere all'amministratore di abilitare e impostare il modulo <strong>%s</strong>. Si noti che entrambi i metodi (manuale e automatico) possono essere utilizzati insieme senza alcun rischio di duplicazione.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Elimina template di fattura
 ConfirmDeleteRepeatableInvoice=Sei sicuro di voler eliminare il modello di fattura?
 CreateOneBillByThird=Crea una fattura per soggetto terzo (altrimenti, una fatture per ordine)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Imposta data di inizio
 AutoFillDateTo=Imposta data di fine per la riga di servizio con la successiva data fattura
 AutoFillDateToShort=Imposta data di fine
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Fattura cancellata
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index f5dfa66bce0..9096d84fdf6 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Mostra società
 ShowStock=Mostra magazzino
 DeleteArticle=Clicca per rimuovere l'articolo
 FilterRefOrLabelOrBC=Cerca (Rif/Etichetta)
-UserNeedPermissionToEditStockToUsePos=Il sistema è impostato per diminuire le scorte alla creazione della fattura, quindi l'utente che usa il punto vendita deve avere i permessi corretti per modificare le scorte.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Stampante di ricevute Dolibarr
+PointOfSale=Punti vendita
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index b77dfd0cc60..ae6a92c63b0 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonata
 ActionAC_FAX=Invia fax
 ActionAC_PROP=Invia proposta
 ActionAC_EMAIL=Invia email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Riunione
 ActionAC_INT=Intervento presso cliente
 ActionAC_FAC=Invia fattura
@@ -72,8 +73,8 @@ StatusProsp=Stato del cliente potenziale
 DraftPropals=Bozze di proposte commerciali
 NoLimit=Nessun limite
 ToOfferALinkForOnlineSignature=Link per firma online
-WelcomeOnOnlineSignaturePage=Benvenuti nella pagina per accettare proposte commerciali da %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=Questa schermata consente di accettare e firmare, o rifiutare, un preventivo/proposta commerciale
 ThisIsInformationOnDocumentToSign=Queste sono informazioni sul documento da accettare o rifiutare
-SignatureProposalRef=Firma del preventivo/proposta commerciale %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Funzionalità per la firma online disattivata o documento generato prima che la funzione fosse abilitata
diff --git a/htdocs/langs/it_IT/dict.lang b/htdocs/langs/it_IT/dict.lang
index dd17e81a7f2..e973bb904ef 100644
--- a/htdocs/langs/it_IT/dict.lang
+++ b/htdocs/langs/it_IT/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Isola Heard e McDonald
 CountryVA=Santa Sede (Stato della Città del Vaticano)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Islanda
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Corea del Nord
 CountryKR=Corea del Sud
 CountryKW=Kuwait
-CountryKG=Kirghizistan
+CountryKG=Kyrgyzstan
 CountryLA=Laos
 CountryLV=Lettonia
 CountryLB=Libano
@@ -160,7 +160,7 @@ CountryMD=Moldavia
 CountryMN=Mongolia
 CountryMS=Montserrat
 CountryMZ=Mozambico
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad e Tobago
 CountryTR=Turchia
 CountryTM=Turkmenistan
-CountryTC=Turks e Isole Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ucraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Rupie delle Mauritius
 CurrencySingMUR=Rupia delle Mauritius
 CurrencyNOK=Corone norvegesi
-CurrencySingNOK=corona norvegese
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=TND
 CurrencySingTND=Dinaro tunisino
 CurrencyUSD=Dollari USA
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Passaparola
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Dipendente
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formato 4A0
 PaperFormatEU2A0=Formato 2A0
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index ccb8593c9b7..84390cc378f 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Numero di documenti nella directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Directory manuale
 ECMSectionAuto=Directory automatica
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documenti collegati ai progetti
 ECMDocsByUsers=Documenti collegati agli utenti
 ECMDocsByInterventions=Documenti collegati agli interventi
 ECMDocsByExpenseReports=Documenti collegati a note spese
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nessuna directory creata
 ShowECMSection=Visualizza la directory
 DeleteSection=Eliminare la directory
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index a797c43891d..23c00683cf6 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=Nessuna variabile globale selezionata
 ErrorFieldMustBeANumeric=Il campo <b>%s</b> deve essere un valore numerico
 ErrorMandatoryParametersNotProvided=Parametri obbligatori non definiti
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
diff --git a/htdocs/langs/it_IT/help.lang b/htdocs/langs/it_IT/help.lang
index 617dcc914f2..e8594bd9410 100644
--- a/htdocs/langs/it_IT/help.lang
+++ b/htdocs/langs/it_IT/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Assistenza online
 OtherSupport=Altre forme di assistenza
 ToSeeListOfAvailableRessources=Per contattare/vedere le risorse disponibili:
 HelpCenter=Centro assistenza
-DolibarrHelpCenter=Centro assistenza e supporto Dolibarr
-ToGoBackToDolibarr=Clicca <a href="%s">qui</a> per tornare ad usare Dolibarr
-TypeOfSupport=Tipi di assistenza
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Comunità (gratuito)
 TypeSupportCommercial=Commerciale
 TypeOfHelp=Tipo di aiuto
@@ -15,12 +15,9 @@ NeedHelpCenter=Hai bisogno di aiuto o di supporto?
 Efficiency=Efficienza
 TypeHelpOnly=Solo aiuto
 TypeHelpDev=Guida per lo sviluppo
-TypeHelpDevForm=Aiuto per lo Sviluppo e la Formazione
-ToGetHelpGoOnSparkAngels1=Alcune aziende possono fornire un supporto online più veloce (a volte immediato) prendendo il controllo del computer. Tali aiuti possono essere trovati sul sito <b>web %s:</b>
-ToGetHelpGoOnSparkAngels3=È inoltre possibile accedere alla lista di tutti i servizi di supporto per Dolibarr. Clicca sul pulsante.
-ToGetHelpGoOnSparkAngels2=Può accadere che alcune aziende non siano disponibili al momento della ricerca. Usa il filtro "tutte le disponibilità" per poter inviare più richieste.
-BackToHelpCenter=In caso contrario, clicca <a href="%s">qui</a> per tornare al centro assistenza e supporto.
-LinkToGoldMember=È possibile chiamare uno dei servizi preselezionati da Dolibarr per la propria lingua ( %s) cliccando sul relativo Widget (stato e prezzo massimo vengono aggiornati automaticamente):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Lingue supportate
-SubscribeToFoundation=Aiuta il progetto Dolibarr, iscriviti alla fondazione
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Per vedere le pagine ufficiali di aiuto su Dolibarr nella tua lingua: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index a0926f206a9..846a6d6afe5 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Risorse umane
-Holidays=Assenze
-CPTitreMenu=Assenze
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Estratto conto mensile
 MenuAddCP=Nuova richiesta
-NotActiveModCP=Per visualizzare questa pagina devi attivare il modulo Assenze
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Inserisci nuova richiesta
 DateDebCP=Data di inizio
 DateFinCP=Data di fine
@@ -15,13 +15,18 @@ ApprovedCP=Approvato
 CancelCP=Cancellato
 RefuseCP=Rifiutato
 ValidatorCP=Approvato da
-ListeCP=Elenco delle assenze
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Sarà approvato da
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Descrizione
 SendRequestCP=Inserisci richiesta di assenza
 DelayToRequestCP=Le richieste devono essere inserite almeno <b>%s giorni</b> prima dell'inizio.
-MenuConfCP=Bilancio delle ferie
-SoldeCPUser=Rimangono <b>%s</b> giorni di ferie
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=La data di fine deve essere posteriore alla data di inizio.
 ErrorSQLCreateCP=Si è verificato un errore SQL durante la creazione:
 ErrorIDFicheCP=Si è verificato un errore: la richiesta non esiste.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Non hai i permessi necessari a visualizzare questa richiesta.
 InfosWorkflowCP=Flusso di informazioni
 RequestByCP=Richiesto da
 TitreRequestCP=Richiesta di assenza
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Numero di giornate di ferie già godute
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Modifica
 DeleteCP=Cancella
 ActionRefuseCP=Rifiuta
@@ -59,6 +71,7 @@ DateRefusCP=Data del rifiuto
 DateCancelCP=Data dell'annullamento
 DefineEventUserCP=Assegna permesso straordinario all'utente
 addEventToUserCP=Assegna permesso
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Motivo
 UserCP=Utente
 ErrorAddEventToUserCP=Si è verificato un errore nell'assegnazione del permesso straordinario.
@@ -81,10 +94,15 @@ EmployeeFirstname=Nome dipendente
 TypeWasDisabledOrRemoved=Permesso di tipo (ID %s) è stato disabilitato o rimosso
 LastHolidays=Ultime %s richieste di permesso
 AllHolidays=Tutte le richieste di permesso
-
+HalfDay=Mezza giornata
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Ultimo aggiornamento automatico dell'assegnazione ferie
-MonthOfLastMonthlyUpdate=Mese dell'ultimo aggiornamento automatico delle ferie maturate
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Aggiornato con successo
 Module27130Name= Gestione ferie
 Module27130Desc= Gestione ferie
@@ -94,7 +112,7 @@ NoticePeriod=Periodo di avviso
 HolidaysToValidate=Convalida ferie
 HolidaysToValidateBody=Di sotto una richiesta ferie da convalidare
 HolidaysToValidateDelay=Questa richiesta avrà luogo fra meno di %s giorni
-HolidaysToValidateAlertSolde=L'utente che ha fatto questa richiesta di ferie non ha abbastanza giorni disponibili.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Richieste di assenza approvate
 HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata approvata
 HolidaysRefused=Richiesta negata
@@ -103,4 +121,9 @@ HolidaysCanceled=Richiesta di assenza cancellata
 HolidaysCanceledBody=La tua richiesta di ferie dal %s al %s è stata cancellata
 FollowedByACounter=<strong>1</strong>: questo tipo di ferie segue un contatore. Il contatore incrementa automaticamente o manualmente e quando una richiesta di ferie è validata. il contatore decrementa.<br><strong>0</strong>: non segue nessun contatore
 NoLeaveWithCounterDefined=Non ci sono tipi di ferie definite che devono seguire un contatore
-GoIntoDictionaryHolidayTypes=Vai in <strong>Home - Impostazioni - Dizionari - Tipi di ferie</strong> per impostare i differenti tipi di ferie
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 4a3940911fd..c2aca3670f0 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Abbiamo cercato di semplificare al massimo l' installazione di Dolibarr. Basta seguire le istruzioni passo per passo.
 MiscellaneousChecks=Verificare prerequisiti
 ConfFileExists=Il file di configurazione <b>%s</b> esiste.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Il file di configurazione <b>%s</b> non esiste e non può essere creato!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Il file <b>%s</b> può essere creato.
-ConfFileIsNotWritable=Il file di configurazione <b>%s</b> non è scrivibile. Controllare le autorizzazioni. Durante la prima installazione, il server web deve essere in grado di scrivere in questo file durante il processo di configurazione (usa, per esempio il comando "chmod 666" per renderlo scrivibile da tutti gli utenti su sistemi operativi Unix e simili).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Il file di configurazione <b>%s</b> è scrivibile.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Ricarica tutte le informazioni dal file di configurazione
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP supporta le sessioni.
 PHPSupportPOSTGETOk=PHP supporta le variabili GET e POST.
-PHPSupportPOSTGETKo=È possibile che l'installazione di PHP non supporti le variabili POST e/o GET. Controlla il parametro <b>variables_order</b> nel file <b>php.ini</b>.
-PHPSupportGD=PHP con supporto grafico GD.
-PHPSupportCurl=Questo PHP support cURL.
-PHPSupportUTF8=PHP supporta le funzioni UTF-8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=La memoria massima per la sessione è fissata dal PHP a <b>%s</b>. Dovrebbe essere sufficiente.
-PHPMemoryTooLow=La memoria massima per la sessione è fissata dal PHP a <b>%s</b> byte. Cambia il file <b>php.ini</b> per impostare il parametro <b>memory_limit</b> ad almeno <b>%s</b> byte.
-Recheck=Clicca qui per ripetere i controlli
-ErrorPHPDoesNotSupportSessions=La tua installazione di PHP non supporta le sessioni. Dolibarr non può funzionare senza. Risolvere questo problema prima di installare Dolibarr.
-ErrorPHPDoesNotSupportGD=La tua installazione di PHP non supporta la funzione grafica GD. Non sarà disponibile alcun grafico.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=L'attuale installazione di PHP non supporta cURL.
-ErrorPHPDoesNotSupportUTF8=L'installazione di PHP non supporta funzioni UTF-8. Dolibarr non può funzionare correttamente.Risolvere questo problema prima di installare Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=La directory <b>%s</b> non esiste.
-ErrorGoBackAndCorrectParameters=Torna indietro e correggi i parametri sbagliati.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Potresti aver digitato un valore errato per il parametro <b>%s</b>.
 ErrorFailedToCreateDatabase=Impossibile creare il database <b>%s</b>.
 ErrorFailedToConnectToDatabase=Impossibile collegarsi al database <b>%s</b>.
 ErrorDatabaseVersionTooLow=La versione del database (%s) è troppo vecchia. È richiesta la versione %s o superiori.
 ErrorPHPVersionTooLow=Versione PHP troppo vecchia. E' obbligatoria la versione %s o superiori.
-ErrorConnectedButDatabaseNotFound=Connessione al server avvenuta con successo, ma il database <b>%s</b> non è stato trovato.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Il database <b>%s</b> esiste già.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Se il database non esiste, torna indietro e seleziona l'opzione "Crea database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Se il database esiste già, torna indietro e deseleziona l'opzione "Crea database".
-WarningBrowserTooOld=La versione del browser è troppo vecchia. È raccomandato l'aggiornamento a una versione recente di Firefox, Chrome o Opera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Versione PHP
 License=Licenza d'uso
 ConfigurationFile=File di configurazione
@@ -45,22 +45,23 @@ DolibarrDatabase=Database Dolibarr
 DatabaseType=Tipo di database
 DriverType=Tipo di driver
 Server=Server
-ServerAddressDescription=Nome o indirizzo IP del database server. Quando il database è ospitato sullo stesso server del web, utilizzare <b>localhost</b>.
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Porta. Lasciare vuoto se sconosciuta.
 DatabaseServer=Database server
 DatabaseName=Nome del database
-DatabasePrefix=Prefisso delle tabelle del database
-AdminLogin=Login per amministratore del database. Da lasciare vuoto se ci si collega in forma anonima
-PasswordAgain=Conferma la password una seconda volta
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password per amministratore del database. Da lasciare vuoto se ci si collega in forma anonima
 CreateDatabase=Crea database
-CreateUser=Crea un proprietario o concedigli i permessi all'interno del database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Accesso superutente al database
-CheckToCreateDatabase=Seleziona questa opzione se il database non esiste e deve essere creato.<br>Sarà necessario indicare login e password dell'account di root in fondo a questa pagina.
-CheckToCreateUser=Flegga se l'admin del database non esiste e deve essere creato, o se esiste ma il database non esiste e i permessi devono ancora essere concessi. <br>in questo caso, devi scegliere login e password e riempirli con login/password del superutente in fondo a questa pagina. Se non è fleggato, l'admin del database e la sua password esistono già.
-DatabaseRootLoginDescription=Login utente con permesso di creare nuovi database o nuovi utenti. Non è necessario se il database esiste già.
-KeepEmptyIfNoPassword=Lasciare vuoto se l'utente non ha alcuna password (da evitare per motivi di sicurezza)
-SaveConfigurationFile=Salva file
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Connessione al server
 DatabaseCreation=Creazione del database
 CreateDatabaseObjects=Creazione degli oggetti del database
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Creazione vincoli e indici per la tabella %s
 OtherKeysCreation=Creazione vincoli e indici
 FunctionsCreation=Creazione funzioni
 AdminAccountCreation=Creazione accesso amministratore
-PleaseTypePassword=Digitare una password. Le password vuote non sono ammesse!
-PleaseTypeALogin=Inserire un nome utente per il login!
-PasswordsMismatch=Le password digitate sono diverse, si prega di riprovare!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Fine della configurazione
 SystemIsInstalled=Installazione completata.
 SystemIsUpgraded=Dolibarr è stato aggiornato con successo.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Dolibarr deve essere configurato per soddisfare le vos
 AdminLoginCreatedSuccessfuly=Account amministratore '<b>%s</b>' creato con successo.
 GoToDolibarr=Vai a Dolibarr
 GoToSetupArea=Vai alla pagina impostazioni
-MigrationNotFinished=La versione del vostro database non è stata aggiornata completamente, eseguire nuovamente l'aggiornamento.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Vai alla pagina di aggiornamento
 WithNoSlashAtTheEnd=Senza la barra "/" alla fine
-DirectoryRecommendation=Si raccomanda l'utilizzo di una directory al di fuori della directory delle pagine web.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Esiste già
 DolibarrAdminLogin=Login dell'amministratore di Dolibarr
-AdminLoginAlreadyExists=L'account amministratore <b> %s </b> esiste già.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Impossibile creare l'account amministratore di Dolibarr.
-WarningRemoveInstallDir=Attenzione, per motivi di sicurezza, una volta completata l'installazione o l'aggiornamento, rimuovere la directory <b>install</b> o rinominarla <b>install.lock</b>, al fine di evitarne un uso malevolo.
-FunctionNotAvailableInThisPHP=Non disponibile su questa installazione di PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Scegli script di migrazione
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Elaborazione dello script
 ChooseYourSetupMode=Scegli la modalità di impostazione e clicca "start"
 FreshInstall=Nuova installazione
-FreshInstallDesc=Seleziona questa opzione se è una prima installazione. In caso contrario, questa modalità può riparare una precedente installazione incompleta. Se invece si desidera aggiornare la versione installata, scegliere "Aggiorna".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Aggiornamento
 UpgradeDesc=Usare questo metodo per sostituire una vecchia installazione Dolibarr con una versione più recente. Ciò aggiornerà il database e i dati.
 Start=Inizio
 InstallNotAllowed=Impossibile completare l'installazione a causa dei permessi del file <b>conf.php</b>
 YouMustCreateWithPermission=È necessario creare il file %s e dare al server web i permessi di scrittura durante il processo di installazione.
-CorrectProblemAndReloadPage=Correggi il problema e ricaricare la pagina premendo F5.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Già migrate
 DatabaseVersion=Versione database
 ServerVersion=Versione del server
 YouMustCreateItAndAllowServerToWrite=È necessario creare questa directory e dare al server web i permessi di scrittura sulla stessa.
 DBSortingCollation=Ordinamento caratteri (Collation)
-YouAskDatabaseCreationSoDolibarrNeedToConnect=È richiesta la creazione del database <b>%s</b>. Perciò Dolibarr necessita di collegarsi al server <b>%s</b> come superutente con <b>%s</b> autorizzazioni.
-YouAskLoginCreationSoDolibarrNeedToConnect=È richiesta la creazione dell'utenza <b>%s</b>. Perciò Dolibarr necessita di collegarsi al server <b>%s</b> come superutente con <b>%s</b> autorizzazioni.
-BecauseConnectionFailedParametersMayBeWrong=Connessione fallita, nome utente e password possono essere errati.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Pagamenti orfani sono stati rilevati con il metodo %s
 RemoveItManuallyAndPressF5ToContinue=Rimuovere manualmente e premere F5 per continuare.
 FieldRenamed=Campo rinominato
-IfLoginDoesNotExistsCheckCreateUser=Se il login non esiste ancora, è necessario selezionare l'opzione "Crea utente"
-ErrorConnection=Server <b>%s</b>, nome del database <b>%s</b>, login <b>%s</b> o la password del database può essere sbagliata o la versione di PHP è troppo vecchia rispetto alla versione del database.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Si raccomanda di installare la versione <b>%s</b> al posto dell'attuale <b>%s</b>
 InstallChoiceSuggested=<b>Scelta suggerita dall'installer</b>.
-MigrateIsDoneStepByStep=La versione richiesta (%s) è più avanti di varie versioni, quindi la procedura guidata suggerirà uns nuova migrazione una volta finita questa.
-CheckThatDatabasenameIsCorrect=Controllare che il nome del database sia corretto (<b>%s</b>)
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Se il nome è esatto e il database non esiste ancora, seleziona l'opzione "Crea database".
 OpenBaseDir=Parametro <b>openbasedir</b>
-YouAskToCreateDatabaseSoRootRequired=Hai selezionato la casella "Crea database". Perciò è necessario inserire nome utente/password del superuser in fondo alla pagina.
-YouAskToCreateDatabaseUserSoRootRequired=Hai selezionato la casella "Crea il proprietario del database". Perciò è necessario inserire nome utente/password del superuser in fondo alla pagina.
-NextStepMightLastALongTime=Il passaggio in corso può richiedere diverso tempo. Attendi il caricamento completo della schermata successiva prima di continuare.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrare la spedizione per l'arhiviazione degli ordini dei clienti
 MigrationShippingDelivery=Aggiornamento spedizione
 MigrationShippingDelivery2=Aggiornamento spedizione 2
 MigrationFinished=Migrazione completata
-LastStepDesc=<strong>Ultimo passo:</strong> Indicare qui login e password che si prevede di utilizzare per la connessione al software. Non dimenticare questi dati perché è l'unico account in grado di amminsitrare tutti gli altri.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Attiva modulo %s
 ShowEditTechnicalParameters=Clicca qui per mostrare/modificare i parametri avanzati (modalità esperti)
-WarningUpgrade=Attenzione:\nHai già fatto un backup del database?\nTi raccomando di eseguire un backup prima di procedere. A causa di alcuni bugs nei sistemi database (ad esempio nella versione mysql 5.5.40/41/42/43), alcuni dati o tabelle potrebbero andare persi durante il processo. Pertanto ti suggerisco fortemente di effettuare un dump completo del tuo database prima di iniziare la migrazione.\n\nClicca OK per iniziare il processo di migrazione...
-ErrorDatabaseVersionForbiddenForMigration=La tua versione del database è %s. Essa soffre di un bug critico se si cambia la struttura del database, come è richiesto dal processo di migrazione. Per questa ragione non sarà consentita la migrazione fino a quando non verrà aggiornato il database a una versione stabile più recente (elenco delle versioni probleematiche: %s)
-KeepDefaultValuesWamp=Si sta utilizzando la configurazione guidata DoliWamp, quindi i valori proposti sono già ottimizzati. Modifica i parametri solo se sai quello che fai.
-KeepDefaultValuesDeb=Si sta utilizzando la configurazione guidata di un pacchetto (Debian, Ubuntu o simili), quindi i valori proposti sono già ottimizzati. Basta inserire la password per la creazione del database. Modifica gli altri parametri solo se sai quello che fai.
-KeepDefaultValuesMamp=Si sta utilizzando la configurazione guidata DoliMamp, quindi i valori proposti sono già ottimizzati. Modifica i parametri solo se sai quello che fai.
-KeepDefaultValuesProxmox=Si sta utilizzando la configurazione guidata di una virtual appliance Proxmox, quindi i valori proposti sono già ottimizzati. Modifica i parametri solo se sai quello che fai.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Inserisci almeno una opzione come parametro nell'indirizzo URL. Per esempio: '...repair.php?standard=confirmed'
 NothingToDelete=Nulla da ripulire/eliminare
 NothingToDo=Nessuna azione da fare
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Aggiornamento dei dati dei contratti
 MigrationContractsNumberToUpdate=%s contratto(i) da aggiornare
 MigrationContractsLineCreation=Crea riga per il contratto con riferimento %s
 MigrationContractsNothingToUpdate=Non ci sono più cose da fare
-MigrationContractsFieldDontExist=Il campo fk_facture non esiste più. Niente da fare.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Correzione contratti con date vuote
-MigrationContractsEmptyDatesUpdateSuccess=Correzione dei contratti con data vuota effettuata con successo
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Nessuna data di contratto vuota da correggere
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nessuna data di creazione contratto da correggere
 MigrationContractsInvalidDatesUpdate=Correzione dei contratti con date errate
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Aggiornamento spedizioni
 MigrationStockDetail=Aggiornamento delle scorte dei prodotti
 MigrationMenusDetail=Aggiornamento dinamico dei menu
 MigrationDeliveryAddress=Aggiornamento indirizzo di consegna per le spedizioni
-MigrationProjectTaskActors=Migrazione dei dati della tabella llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migrazione dei dati del campo fk_user_resp da llx_projet a llx_element_contact
 MigrationProjectTaskTime=Aggiorna tempo trascorso in secondi
 MigrationActioncommElement=Aggiornare i dati sulle azioni
 MigrationPaymentMode=Migrazione dei dati delle modalità di pagamento
 MigrationCategorieAssociation=Migrazione delle categorie
-MigrationEvents=Migrazione degli eventi per aggiungere i proprietari nella tabella degli utilizzatori assegnati
-MigrationEventsContact=Migrazione di eventi per aggiungere un contatto evento nella tabella assegnazioni
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Aggiorna il valore del campo entità di llx_user_rights
 MigrationUserGroupRightsEntity=Aggiorna il valore del campo entità di llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Ricarica modulo %s
 MigrationResetBlockedLog=Reset del modulo BlockedLog per l'algoritmo v7
-ShowNotAvailableOptions=Mostra opzioni non disponibili
-HideNotAvailableOptions=Nascondi opzioni non disponibili
-ErrorFoundDuringMigration=L'errore si è verificato durante il processo di migrazione quindi il prossimo step non sarà disponibile. Per ignorare gli errori puoi <a href="%s">cliccare qui</a>, ma l'applicazione o qualche funzionalità potrebbe non funzionare correttamente fino alla correzione dell'errore.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 5b4ba9db65b..192862cfc55 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contatti per il soggetto terzo
 ContactsAddressesForCompany=Contatti/indirizzi per questo soggetto terzo
 AddressesForCompany=Indirizzi per questo soggetto terzo
 ActionsOnCompany=Azioni sul soggetto terzo
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Azioni su questo membro
 ActionsOnProduct=Eventi su questo prodotto
 NActionsLate=%s azioni in ritardo
@@ -847,9 +848,9 @@ ModuleBuilder=Mudulo programmatore
 SetMultiCurrencyCode=Imposta valuta
 BulkActions=Azioni in blocco
 ClickToShowHelp=Clicca per mostrare l'aiuto contestuale
-WebSite=Sito web
+WebSite=Website
 WebSites=Siti web
-WebSiteAccounts=Account del sito web
+WebSiteAccounts=Website accounts
 ExpenseReport=Nota spese
 ExpenseReports=Nota spese
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File condiviso con un link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index ffaec5cbf22..72b1331fba4 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Oggetto collegato
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Impostazioni modulo Website
 WEBSITE_PAGEURL=Indirizzo URL della pagina
 WEBSITE_TITLE=Titolo
 WEBSITE_DESCRIPTION=Descrizione
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Parole chiave
 LinesToImport=Righe da importare
diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang
index 75932d7168d..89648b2fe62 100644
--- a/htdocs/langs/it_IT/paybox.lang
+++ b/htdocs/langs/it_IT/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Impostazioni modulo Paybox
 PayBoxDesc=Questo modulo offre pagine per consentire il pagamento attraverso <a href="http://www.paybox.com" target="_blank">Paybox</a> da parte dei clienti. Può essere usato per un pagamento qualsiasi o per il pagamento di specifici oggetti Dolibarr (fattura, ordine, ...)
 FollowingUrlAreAvailableToMakePayments=Puoi utilizzare i seguenti indirizzi per permettere ai clienti di effettuare pagamenti su Dolibarr
 PaymentForm=Forma di pagamento
-WelcomeOnPaymentPage=Benvenuti sul nostro servizio di pagamento online
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Questa schermata consente di effettuare un pagamento online su %s.
 ThisIsInformationOnPayment=Informazioni sul pagamento da effettuare
 ToComplete=Per completare
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL per il pagamento %s di una fattura
 ToOfferALinkForOnlinePaymentOnContractLine=URL per il pagamento %s di una riga di contratto
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL per il pagamento %s di un importo
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per il pagamento %s dell'adesione di un membro
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Puoi anche aggiungere a qualunque di questi url il parametro <b>&tag=<i>value</i></b> (richiesto solo per il pagamento gratuito) per aggiungere una tag con un tuo commento.
-SetupPayBoxToHavePaymentCreatedAutomatically=Imposta il tuo Paybox con <b>url %s</b> perché venga automaticamente creato un pagamento alla convalida di Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Il pagamento è stato registrato. Grazie.
-YourPaymentHasNotBeenRecorded=Il pagamento non è stato registrato e la transazione è stata annullata. Grazie.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Dati account
 UsageParameter=Parametri d'uso
 InformationToFindParameters=Aiuto per trovare informazioni sul tuo account %s
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index c511dfa796a..77a4a1e6647 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Firmato (da fatturare)
 PropalStatusNotSigned=Non firmato (chiuso)
 PropalStatusBilled=Fatturato
 PropalStatusDraftShort=Bozza
-PropalStatusValidatedShort=Convalidato
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Chiuso
 PropalStatusSignedShort=Firmato
 PropalStatusNotSignedShort=Non firmato
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Preventivo %s non trovato
 AddToDraftProposals=Aggiungi una bozza di preventivo
 NoDraftProposals=Nessuna bozza di preventivo
 CopyPropalFrom=Crea preventivo da uno esistente
-CreateEmptyPropal=Crea preventivo vuoto o dalla lista dei prodotti / servizi
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Durata di validità predefinita per i preventivi (in giorni)
-UseCustomerContactAsPropalRecipientIfExist=Utilizzare l'indirizzo del contatto cliente se definito al posto dell'indirizzo del destinatario
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clona preventivo
 ConfirmClonePropal=Vuoi davvero clonare il preventivo<b>%s</b>?
 ConfirmReOpenProp=Vuoi davvero riaprire il preventivo <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Responsabile per il cliente
 TypeContact_propal_external_SHIPPING=Contatto cliente per la consegna
 # Document models
 DocModelAzurDescription=Modello di preventivo completo (logo...)
+DocModelCyanDescription=Modello di preventivo completo (logo...)
 DefaultModelPropalCreate=Creazione del modello predefinito
 DefaultModelPropalToBill=Modello predefinito quando si chiude un preventivo (da fatturare)
 DefaultModelPropalClosed=Modello predefinito quando si chiude un preventivo (da non fatturare)
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 0bbb5e11b07..25fda3bd534 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Codice
-WebsiteSetupDesc=Crea qui tante voci quante il numero di siti ti servono. Vai poi nel menu Websites per modificarli
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Cancella sito web
-ConfirmDeleteWebsite=Sei sicuro di vole cancellare questo sito web? Anche tutte le pagine e contenuti saranno cancellati.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Titolo/alias della pagina
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Indirizzo URL del file CSS esterno
 WEBSITE_CSS_INLINE=contenuto file CSS (comune a tutte le pagine)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=File Robot (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Libreria media
-EditCss=Edita Header Style/CSS o HTML
+EditCss=Edit website properties
 EditMenu=Modifica menu
 EditMedias=Edit medias
-EditPageMeta=Modifica metadati
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=L'anteprima del sito <strong>%s</strong> non è ancora disponibile. Devi prima aggiungere almeno una pagina.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=Visualizza pagina in una nuova scheda
 SetAsHomePage=Imposta come homepage
 RealURL=Indirizzo URL vero
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Da leggere
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Sito web aggiunto
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=ID della pagina
 Banner=Banner
 BlogPost=Articoli sul blog
-WebsiteAccount=Web site account
-WebsiteAccounts=Account del sito web
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 2a67fe4277f..05540c2213f 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=デモで機能を無効にする
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-モジュールツール
 ModuleFamilyExperimental=実験的なモジュール
 ModuleFamilyFinancial=金融モジュール（会計/財務）
 ModuleFamilyECM=電子コンテンツ管理（ECM）
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=メニューハンドラ
 MenuAdmin=メニューエディタ
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=ユーザーとグループ
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=会社と連絡先の管理
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=コマーシャル
 Module2Desc=商業管理
 Module10Name=会計
@@ -501,7 +501,7 @@ Module23Desc=エネルギーの消費量を監視する
 Module25Name=顧客からの注文
 Module25Desc=顧客の注文の管理
 Module30Name=請求書
-Module30Desc=請求書、顧客のクレジットメモの管理。仕入先の請求書の管理
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=サプライヤー
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VATレートまたは販売税率
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=支払条件
 DictionaryPaymentModes=支払いモード
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax（WEEE）
 DictionaryPaperFormat=紙の形式
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフォルトで使用されるラベル
 LabelOnDocuments=ドキュメントのラベル
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=今月末に
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=セキュリティ監査イベント
-Audit=監査
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Dolibarrセキュリティイベントのリスト
 SecurityEventsPurged=セキュリティイベントのパージ
-LogEventDesc=ここDolibarrセキュリティイベントのロギングを有効にすることができます。 <b>監査-</b>管理者は、メニューの<b>システムツール</b>を介してそのコンテンツを見ることができます。警告は、この機能は、データベース内のデータを大量に消費することができます。
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
 SystemAreaForAdminOnly=この領域は、管理者ユーザーのために利用可能です。 Dolibarr権限のいずれも、この制限を減らすことはできません。
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=製品の売上単価
 TotalPriceAfterRounding=丸め後の総価格（純/ VAT /税込）
 ParameterActiveForNextInputOnly=次の入力のための効果的なパラメータのみ
-NoEventOrNoAuditSetup=は、セキュリティイベントがまだ記録されていません。監査が有効になっていない場合、これは正常であることができる &quot;設定 - セキュリティ - 監査&quot;ページを参照してください。
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=ローカルのsendmailの設定を参照してください。
 BackupDesc=Dolibarrの完全なバックアップを作成するには、以下を行う必要があります。
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=ZIP
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 9b81fb957cd..c02f3ae141e 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -7,7 +7,7 @@ BankName=銀行名
 FinancialAccount=アカウント
 BankAccount=預金
 BankAccounts=銀行口座
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=金融口座のref
 AccountLabel=金融口座のラベル
@@ -46,7 +46,7 @@ BankAccountDomiciliation=アカウントのアドレス
 BankAccountCountry=アカウントの国
 BankAccountOwner=アカウントの所有者名
 BankAccountOwnerAddress=アカウントの所有者のアドレス
-RIBControlError=値の整合性チェックが失敗します。これは、この口座番号の情報が（国、数字とIBANをチェック）、完全または間違っていないことを意味します。
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=アカウントを作成する
 NewBankAccount=新しいアカウント
 NewFinancialAccount=新しい金融口座
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=共存し得る
 Conciliate=調整する
 Conciliation=和解
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=閉じたアカウントを含める
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=銀行の転送
 BankTransfers=銀行振込
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=からの
 TransferTo=への
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されています。
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=銀行小切手
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=預金証書を確認表示する
-NumberOfCheques=小切手のNb
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=戻るアカウントへ
 ShowAllAccounts=すべてのアカウントに表示
-FutureTransaction=フューチャーのトランザクション。調停する方法はありません。
-SelectChequeTransactionAndGenerate=チェックの預金証書に含まれると、&quot;作成&quot;をクリックしてチェックをフィルタリング/選択してください。
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index e2f79118a4f..920007f1c33 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=見積送り状
 InvoiceProFormaDesc=<b>プロフォーマインボイスは、</b>真<b>の</b>請求書のイメージですが、どんな会計の値を持っていません。
 InvoiceReplacement=交換用の請求書
 InvoiceReplacementAsk=請求書の交換請求書
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=クレジットメモ
 InvoiceAvoirAsk=請求書を訂正するためにクレジットノート
-InvoiceAvoirDesc=<b>クレジット·ノートでは、</b>請求書が実際に支払った量よりも異なります（顧客がエラーによってあまりにも多くを支払った、または彼が例えば、いくつかの製品が返されましたので、完全に支払われないため）量を持っているという事実を解決するために使用される負の請求書です。
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=支払いを削除します。
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=仕入先の支払
 ReceivedPayments=受け取った支払い
 ReceivedCustomersPayments=顧客から受け取った支払
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=検証するために受信されたお客様のお支払い
 PaymentsReportsForYear=%sの支払い報告書
 PaymentsReports=決済レポート
@@ -91,8 +91,8 @@ PaymentConditionsShort=支払条件
 PaymentAmount=支払金額
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=支払うために思い出させるよりも高い支払い
-HelpPaymentHigherThanReminderToPay=注目は、1つまたは複数の請求書の支払額を支払うための残りの部分よりも高くなっています。 <br>あなたのエントリを編集し、それ以外の場合は確認して、それぞれの過払い請求のために受け取った過剰のクレジットメモを作成する方法について考える。
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=分類 '有料'
 ClassifyPaidPartially='は部分的に有料 &quot;に分類
 ClassifyCanceled=&quot;放棄&quot;を分類する
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=クローズ（無給）
 BillStatusClosedPaidPartially=有料（一部）
 BillShortStatusDraft=ドラフト
 BillShortStatusPaid=有料
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=有料
 BillShortStatusCanceled=放棄された
 BillShortStatusValidated=検証
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=閉じた
 BillShortStatusClosedPaidPartially=有料（一部）
 PaymentStatusToValidShort=検証するには
-ErrorVATIntraNotConfigured=まだ定義されていないIntracommunautary VAT番号
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=デフォルトの支払いモードが定義されていません。この問題を解決する請求モジュールのセットアップに進みます。
 ErrorCreateBankAccount=銀行口座を作成し、支払いのモードを定義するために請求モジュールのセットアップ]パネルに移動
 ErrorBillNotFound=請求書%sは存在しません。
-ErrorInvoiceAlreadyReplaced=エラーは、請求書%sを置き換えるために請求書を検証しよう。しかし、この1つはすでに請求書%sに置き換えられています。
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=既に使用されるエラー、割引
 ErrorInvoiceAvoirMustBeNegative=エラーは、正しい請求書は、負の金額を持っている必要があります
 ErrorInvoiceOfThisTypeMustBePositive=エラー、請求書のこの型は、正の金額を持っている必要があります
 ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、ドラフトの状態のままで別の請求書に置き換えられている請求書を取り消すことはできません
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=から
 BillTo=請求する
 ActionsOnBill=請求書上のアクション
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=悪い顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=製品は、部分的に返される
 ConfirmClassifyPaidPartiallyReasonOther=その他の理由で放棄された金額
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=請求書は、適切なコメントで提供されている場合、この選択が可能です。 （例«のみ実際に支払われた価格に相当する税控除の権利を与える»）
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=一部の国では、この選択はあなたの請求書が正しいメモが含まれている場合にのみ可能であるかもしれません。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=他のすべてに適合しない場合は、この選択肢を使用して、
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>悪い顧客は</b>彼<b>の</b>借金を支払うことを拒否する顧客です。
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=製品の一部が返されたため支払いが完了していない場合は、この選択は使用されます
-ConfirmClassifyPaidPartiallyReasonOtherDesc=他のすべての合っていない場合は、以下の状況で、たとえば、この選択を使用します。 <br> - いくつかの製品が返送されたため支払いが完了しません<br> - 割引を忘れていたため量があまりにも重要な主張<br>すべてのケースで、量が過剰主張は、クレジットメモを作成することにより、会計システムに修正する必要があります。
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=その他
 ConfirmClassifyAbandonReasonOtherDesc=この選択は、他のすべての例で使用されます。交換する請求書を作成することを計画するなどの理由で。
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=請求書を検証する
 UnvalidateBill=請求書をUnvalidate
-NumberOfBills=請求書のNb
-NumberOfBillsByMonth=月別請求書のNb
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=請求書の金額
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=月別請求書の金額（税引後）
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=請求書を表示する
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=顧客の請求書と請求書の行
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=顧客の請求書と支払い
-ExportDataset_invoice_1=顧客の請求書のリストと請求書の行
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=顧客の請求書と支払い
 ProformaBill=プロフォーマビル：
 Reduction=削減
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=ビル·アドレス
-HelpEscompte=この割引は、その支払いが長期前に行われたため、顧客に付与された割引です。
-HelpAbandonBadCustomer=この金額は、放棄されている（顧客が悪い顧客であると）と卓越した緩いとみなされます。
-HelpAbandonOther=それはエラーが発生しましたので、この量は、（例えば、他に置き換え間違った顧客または請求書）放棄されている
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=お支払い番号
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=ない請求書が選択されていません
 CloneInvoice=請求書のクローンを作成する
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=請求書が交換されたため、アクションを無効に
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=支払いのNb
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=二つに割引を分割
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=二つの部分のそれぞれの入力量：
-TotalOfTwoDiscountMustEqualsOriginal=二つの新しい割引の合計は元の割引額と等しくなければなりません。
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=関連する請求書
 RelatedBills=関連する請求書
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=チェック
 PaymentTypeShortCHQ=チェック
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=ラインの支払いに
-PaymentTypeShortVAD=ラインの支払いに
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=ドラフト
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=銀行の詳細
 BankCode=銀行コード
-DeskCode=デスクのコード
+DeskCode=Office code
 BankAccountNumber=口座番号
-BankAccountNumberKey=キー
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN番号
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT番号
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=下記の銀行口座に振込みによるお
 VATIsNotUsedForInvoice=CGIの*非適用される付加価値税がart-293B
 LawApplicationPart1=12/05/80の法則80.335のアプリケーションによって
 LawApplicationPart2=財の所有のまま
-LawApplicationPart3=売り手のキャッシングが完了するまで
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=その価格。
 LimitedLiabilityCompanyCapital=資本金SARL
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=かどうかをチェック
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=請求書の受信者として顧客の請求の連絡先アドレスの代わりにサードパーティのアドレスを使用する
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=すべての未払いの請求書を表示する
 ShowUnpaidLateOnly=後半未払いの請求書のみを表示
 PaymentInvoiceRef=支払いの請求書%s
@@ -474,21 +476,22 @@ Reported=遅延
 DisabledBecausePayments=いくつかの支払いがあるのでできませ​​ん
 CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません
 ExpectedToPay=予想される支払い
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=この支払によって支払った
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが &quot;支払った&quot;に閉鎖され支払うことに残っています。
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=請求書PDFテンプレートのカニ。完全な請求書テンプレート（テンプレートをおすすめ）
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index ba860789feb..511c8872bbf 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=会社を表示
 ShowStock=倉庫を表示
 DeleteArticle=この記事を削除するときにクリックします
 FilterRefOrLabelOrBC=検索 (参照/ラベル)
-UserNeedPermissionToEditStockToUsePos=請求書作成時に在庫を減らすことを依頼するため、POSを使用するユーザーは在庫を編集する権限が必要です。
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr領収書プリンター
+PointOfSale=売上高のポイント
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 9c77d23a0d1..a9c68e6c43e 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=電話
 ActionAC_FAX=FAXを送信
 ActionAC_PROP=メールで提案を送る
 ActionAC_EMAIL=電子メールを送信
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=ミーティング
 ActionAC_INT=Intervention on site
 ActionAC_FAC=メールでの顧客の請求書を送る
@@ -72,8 +73,8 @@ StatusProsp=見通しの状態
 DraftPropals=ドラフト商業の提案
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ja_JP/dict.lang b/htdocs/langs/ja_JP/dict.lang
index ef49eaba6a3..a59b50ac0f2 100644
--- a/htdocs/langs/ja_JP/dict.lang
+++ b/htdocs/langs/ja_JP/dict.lang
@@ -116,7 +116,7 @@ CountryHM=ハード島とマクドナルド
 CountryVA=ローマ法王庁（バチカン市国）
 CountryHN=ホンジュラス
 CountryHK=香港
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=インド
 CountryID=インドネシア
 CountryIR=イラン
@@ -131,7 +131,7 @@ CountryKI=キリバス
 CountryKP=北朝鮮
 CountryKR=韓国
 CountryKW=クウェート
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=ラオ語
 CountryLV=ラトビア
 CountryLB=レバノン
@@ -160,7 +160,7 @@ CountryMD=モルドバ
 CountryMN=モンゴル国
 CountryMS=モントセラト
 CountryMZ=モザンビーク
-CountryMM=Birmania（ミャンマー）
+CountryMM=Myanmar (Burma)
 CountryNA=ナミビア
 CountryNR=ナウル
 CountryNP=ネパール
@@ -223,7 +223,7 @@ CountryTO=トンガ
 CountryTT=トリニダードトバゴ
 CountryTR=トルコ
 CountryTM=トルクメニスタン
-CountryTC=タークス諸島とCailos諸島
+CountryTC=Turks and Caicos Islands
 CountryTV=ツバル
 CountryUG=ウガンダ
 CountryUA=ウクライナ
@@ -277,7 +277,7 @@ CurrencySingMGA=アリアリ
 CurrencyMUR=モーリシャスルピー
 CurrencySingMUR=モーリシャスルピー
 CurrencyNOK=ノルウェークローネ
-CurrencySingNOK=ノルウェークローネ
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=チュニジアディナール
 CurrencySingTND=チュニジアディナール
 CurrencyUSD=米ドル
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=口頭
 DemandReasonTypeSRC_PARTNER=パートナー
 DemandReasonTypeSRC_EMPLOYEE=従業員
 DemandReasonTypeSRC_SPONSORING=後援
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=4A0 用紙
 PaperFormatEU2A0=2A0 用紙
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index 4aee74f2353..57b25903459 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=ディレクトリ内のドキュメントのNb
+ECMNbOfDocs=No. of documents in directory
 ECMSection=ディレクトリ
 ECMSectionManual=手動のディレクトリ
 ECMSectionAuto=自動ディレクトリ
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=作成されたディレクトリなし
 ShowECMSection=ディレクトリを表示する
 DeleteSection=ディレクトリを削除します。
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index f8ac676de7e..6ee187a0541 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ja_JP/help.lang b/htdocs/langs/ja_JP/help.lang
index b6f23e109dc..211b5fe6a6f 100644
--- a/htdocs/langs/ja_JP/help.lang
+++ b/htdocs/langs/ja_JP/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=オンラインリアルタイム/リモートサポート
 OtherSupport=その他のサポート
 ToSeeListOfAvailableRessources=利用可能なリソースに連絡する/表示するには：
 HelpCenter=ヘルプセンター
-DolibarrHelpCenter=Dolibarrヘルプとサポートセンター
-ToGoBackToDolibarr=それ以外の場合は、クリック<a href="%s">Dolibarrを使用して、ここ</a>
-TypeOfSupport=サポートのソース
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=コミュニティ（無料）
 TypeSupportCommercial=コマーシャル
 TypeOfHelp=タイプ
@@ -15,12 +15,9 @@ NeedHelpCenter=ヘルプやサポートが必要ですか？
 Efficiency=効率性
 TypeHelpOnly=唯一の助け
 TypeHelpDev=+の開発を支援
-TypeHelpDevForm=+開発+の形成を助ける
-ToGetHelpGoOnSparkAngels1=一部の企業は、コンピュータの制御を取ることによって、高速（いつか即時）、より効率的なオンラインサポートを提供することができます。このようなヘルパーが<b>%sの</b>ウェブサイトで見つけることができます。
-ToGetHelpGoOnSparkAngels3=また、ボタン上のこのクリックに対して、Dolibarr利用可能なすべてのコーチのリストに行くことができます
-ToGetHelpGoOnSparkAngels2=時には、あなたの検索を行い、現​​時点で利用可能な会社はありませんので、 &quot;すべての可用性&quot;を検索するフィルタを変更すると思います。あなたはより多くの要求を送信することができます。
-BackToHelpCenter=それ以外の場合は、移動するには、ここをクリックして<a href="%s">センターのホームページを助けるために戻って</a> 。
-LinkToGoldMember=あなたは彼のウィジェット（ステータスおよび最大価格が自動的に更新されます）をクリックして言語（%s）にDolibarrによって事前に選択コーチのいずれかを呼び出すことができます。
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=サポートされる言語
-SubscribeToFoundation=Dolibarrプロジェクトの支援、財団への加入
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=お使いの言語での公式Dolibarrサポート: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 05b19a78db4..3b8c0c05fa5 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=開始日
 DateFinCP=終了日
@@ -15,13 +15,18 @@ ApprovedCP=承認された
 CancelCP=キャンセル
 RefuseCP=拒否
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=説明
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=編集
 DeleteCP=削除する
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=理由
 UserCP=ユーザー
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index a4858ce8f37..27493fe222e 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=ちょうどステップごとの手順のステップに従ってください。
 MiscellaneousChecks=前提条件チェック
 ConfFileExists=コンフィギュレーションファイル<b>%sが</b>存在し<b>ています</b> 。
-ConfFileDoesNotExistsAndCouldNotBeCreated=コンフィギュレーションファイル<b>%sが</b>存在しないと作成できませんでした！
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=設定ファイルの<b>%sを</b>作成することができます。
-ConfFileIsNotWritable=設定ファイルの<b>%sが</b>書き込み可能<b>では</b>ありません。権限を確認してください。最初のインストールについては、Webサーバーは、（OSのようなUnix上の例のために&quot;chmod 666&quot;）のコンフィギュレーションプロセス中にこのファイルに書き込むことができるように付与する必要があります。
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=コンフィギュレーションファイルの<b>%sは</b>書き込み可能です。
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=コンフィギュレーションファイルからすべての情報をリロードします。
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=このPHPは、セッションをサポートしています。
 PHPSupportPOSTGETOk=このPHPは、変数はPOSTとGETをサポートしています。
-PHPSupportPOSTGETKo=それはあなたのPHPの設定は変数のPOSTおよび/をサポートしたり、取得していない可能性があります。 php.iniのパラメータ<b>に、variables_orderを</b>確認<b>して</b>ください。
-PHPSupportGD=このPHPのサポートGDグラフィック機能。
-PHPSupportCurl=このPHPはCurlをサポートしています。
-PHPSupportUTF8=このPHPは、UTF8の機能をサポートしています。
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=あなたのPHPの最大のセッションメモリは<b>%s</b>に設定されています。これは十分なはずです。
-PHPMemoryTooLow=あなたのPHPの最大セッション·メモリーが<b>%s</b>バイトに設定されています。これはあまりにも低くする必要があります。少なくとも<b>%s</b>バイト<b>にmemory_limit</b>パラメータを設定するには、php.ini <b>を</b>変更してください。
-Recheck=もっと意味のあるテストはここをクリック
-ErrorPHPDoesNotSupportSessions=PHPのインストールでは、セッションをサポートしていません。この機能はDolibarrの作業を行う必要があります。 PHPの設定を確認してください。
-ErrorPHPDoesNotSupportGD=PHPのインストールはグラフィカル関数GDをサポートしていません。ないグラフは利用できません。
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=お使いのPHPインストールはCurlをサポートしていません。
-ErrorPHPDoesNotSupportUTF8=PHPのインストールは、UTF8の機能をサポートしていません。 Dolibarrが正しく動作することはできません。 Dolibarrをインストールする前にこの問題を解決する。
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=ディレクトリの%sが存在しません。
-ErrorGoBackAndCorrectParameters=後方に移動して、不正なパラメータを修正してください。
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=あなたは、パラメータ  %s 間違った値を入力した可能性があります。
 ErrorFailedToCreateDatabase=データベース %s を作成できませんでした。
 ErrorFailedToConnectToDatabase=データベース %s への接続に失敗しました。
 ErrorDatabaseVersionTooLow=データベースのバージョン (%s) が古すぎます。 バージョン %s 以降が必要です。
 ErrorPHPVersionTooLow=あまりにも古いPHPバージョン。バージョン%sが必要です。
-ErrorConnectedButDatabaseNotFound=しかしデータベース %s 成功したサーバーへの接続を見つけていない。
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=データベース %s は既に存在します。
-IfDatabaseNotExistsGoBackAndUncheckCreate=データベースが存在しない場合は、戻ってオプション&quot;データベースを作成します&quot;をチェック。
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=データベースが既に存在する場合は、戻ってチェックを外してオプションの &quot;データベースの作成&quot;を参照してください。
-WarningBrowserTooOld=ブラウザのバージョンが古すぎます。 ブラウザを、Firefox、Chrome、またはOperaの最新バージョンにアップグレードすることを強くお勧めします。
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHPのバージョン
 License=ライセンスを使用して
 ConfigurationFile=設定ファイル
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarrデータベース
 DatabaseType=データベースの種類
 DriverType=ドライバのタイプ
 Server=サーバーの
-ServerAddressDescription=通常、データベースサーバー、データベースサーバーがWebサーバーよりも、同じサーバー上でホストされている 'localhost'のための名前またはIPアドレス
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=データベース·サーバーのポート。不明の場合は、空の保管してください。
 DatabaseServer=データベース·サーバー
 DatabaseName=データベース名
-DatabasePrefix=データベースの接頭辞テーブル
-AdminLogin=Dolibarrデータベース所有者のログイン。
-PasswordAgain=もう一度パスワードを再入力
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Dolibarrデータベースの所有者のパスワード。
 CreateDatabase=データベースを作成します。
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=データベースサーバ - スーパーユーザーのアクセス
-CheckToCreateDatabase=データベースが存在しない場合はチェックボックスをオンにして作成する必要があります。 <br>このケースでは、このページの下部にスーパーユーザアカウントのログイン/パスワードを入力する必要があります。
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=あなたのデータベースおよびデータベースのログインが既に存在する場合（あなたがウェブホスティングプロバイダによってホストされているときのように）役に立たない、新しいデータベースまたは新しいユーザを作成することを禁止するユーザのログイン。
-KeepEmptyIfNoPassword=ユーザーがパスワードを持っていない場合（これを避けるため）を空のままに
-SaveConfigurationFile=値を保存
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=サーバーへの接続
 DatabaseCreation=データベースの作成
 CreateDatabaseObjects=データベースオブジェクトの作成
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=テーブルの%sの外部キーとインデックスを
 OtherKeysCreation=外部キーとインデックスの作成
 FunctionsCreation=関数の作成
 AdminAccountCreation=管理者ログインの作成
-PleaseTypePassword=パスワードを入力してください、空のパスワードが許可されていません！
-PleaseTypeALogin=ログイン情報を入力してください！
-PasswordsMismatch=パスワードは異なりますが、もう一度試してください！
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=セットアップの終了
 SystemIsInstalled=このインストールは完了です。
 SystemIsUpgraded=Dolibarrが正常にアップグレードされています。
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定
 AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功しました。
 GoToDolibarr=Dolibarrに行く
 GoToSetupArea=Dolibarr（セットアップの領域）に移動します
-MigrationNotFinished=データベースのバージョンが完全に最新ではありませんので、再度アップグレードプロセスを実行する必要があります。
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=ページを再度アップグレードする行く
 WithNoSlashAtTheEnd=末尾のスラッシュ&quot;/&quot;なし
-DirectoryRecommendation=それは、あなたのWeb​​ページのディレクトリの外にディレクトリを使用することを勧めます。
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=すでに存在しています
 DolibarrAdminLogin=Dolibarr adminログイン
-AdminLoginAlreadyExists=Dolibarr管理者アカウント<b>&quot;%s</b> ' <b>は</b>既に存在します。あなたが別のパーティションを作成する場合は、戻ってください。
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗しました。
-WarningRemoveInstallDir=警告、セキュリティ上の理由から、一度インストールまたはアップグレードが完了すると、あなた<b>は</b>それ<b>の悪意のある使用を避けるために、インストールディレクトリを</b>削除<b>するか、Dolibarrのドキュメントディレクトリにinstall.lockと呼ばれるファイルを追加</b>する必要があります<b>。</b>
-FunctionNotAvailableInThisPHP=このPHPは利用できません
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=移行スクリプトを選択します。
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=スクリプト処理
 ChooseYourSetupMode=セットアップモードを選択し、&quot;スタート&quot;をクリック...
 FreshInstall=新規インストール
-FreshInstallDesc=これはあなたの最初のインストールの場合、このモードを使用してください。そうでない場合、このモードでは不完全な以前のインストールを修復することができますが、バージョンをアップグレードする場合、&quot;アップグレード&quot;モードを選択してください。
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=アップグレード
 UpgradeDesc=あなたが新しいバージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用します。これにより、データベースとデータをアップグレードします。
 Start=開始
 InstallNotAllowed=セットアップでは<b>、conf.php</b>の権限で許可されていない
 YouMustCreateWithPermission=あなたは、ファイル%sを作成し、インストールプロセス中にWebサーバのためにそれへの書き込み権限を設定する必要があります。
-CorrectProblemAndReloadPage=問題を修正し、ページをリロードするには、F5キーを押してください。
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=既に移行
 DatabaseVersion=データベースのバージョン
 ServerVersion=データベースサーバのバージョン
 YouMustCreateItAndAllowServerToWrite=このディレクトリを作成し、そこに書き込むようにWebサーバを許可する必要があります。
 DBSortingCollation=文字のソート順
-YouAskDatabaseCreationSoDolibarrNeedToConnect=あなたは、データベースの<b>%sを</b>作成するために求めるが、このために、Dolibarrは、スーパーユーザーの<b>%sの</b>権限でサーバの<b>%s</b>に接続する必要があります。
-YouAskLoginCreationSoDolibarrNeedToConnect=あなたは、データベースのログイン<b>%sを</b>作成するために求めるが、このために、Dolibarrは、スーパーユーザーの<b>%s</b>権限<b>を持つ</b>サーバ<b>%s</b>に接続する必要があります。
-BecauseConnectionFailedParametersMayBeWrong=接続が失敗したように、ホストまたはスーパーユーザパラメータが間違っていなければなりません。
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=メソッド%sによって検出された孤児の支払い
 RemoveItManuallyAndPressF5ToContinue=手動で削除して続行するF5キーを押します。
 FieldRenamed=フィールドの名前変更
-IfLoginDoesNotExistsCheckCreateUser=ログインがまだ存在しない場合は、オプション&quot;ユーザーの作成&quot;をチェックする必要があります
-ErrorConnection=サーバ<b>&quot;%s&quot;、</b>データベース名<b>&quot;%s&quot;、</b>ログイン<b>&quot;%s&quot;、</b>またはデータベースのパスワードは、クライアントのバージョンがデータベースのバージョンに比べて古すぎる可能性があります間違っていたり、PHP可能性があります。
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=あなたの現在のバージョンの<b>%s</b>からバージョン<b>%sを</b>インストールすることをお勧め選択肢
 InstallChoiceSuggested=<b>インストーラによって提案された選択肢をインストールします</b> 。
-MigrateIsDoneStepByStep=対象となるバージョン（%s）は、いくつかのバージョンのギャップがあるため、インストールウィザードは、この1つが終了されますしたら、次の移行を示唆して戻ってくるだろう。
-CheckThatDatabasenameIsCorrect=そのデータベース名<b>&quot;%s&quot;が</b>正しいか確認してください。
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=この名前が正しいこと、およびそのデータベースがまだ存在しない場合は、オプションの&quot;データベースの作成&quot;をチェックする必要があります。
 OpenBaseDir=PHP openbasedirパラメータ
-YouAskToCreateDatabaseSoRootRequired=あなたは &quot;データベースの作成&quot;ボックスをチェックしました。このためには、スーパーユーザー（フォームの下部）のログイン名/パスワードを提供する必要があります。
-YouAskToCreateDatabaseUserSoRootRequired=あなたは &quot;データベース所有者の作成&quot;ボックスをチェックしました。このためには、スーパーユーザー（フォームの下部）のログイン名/パスワードを提供する必要があります。
-NextStepMightLastALongTime=現在のステップには数分かかる場合があります。次の画面が続行する前に完全に表示されるまでしばらくお待ちください。
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=顧客の注文のストレージの出荷を移行
 MigrationShippingDelivery=輸送の容量をアップグレード
 MigrationShippingDelivery2=海運2の容量をアップグレード
 MigrationFinished=マイグレーションが終了しました
-LastStepDesc=<strong>最後のステップ</strong> ：ここにあなたがソフトウェアへの接続に使用する予定のログインとパスワードを定義します。それは他のすべてを管理するアカウントであるとしてこれを紛失しないでください。
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=モジュール%sをアクティブにする
 ShowEditTechnicalParameters=高度なパラメータを表示/編集するには、ここをクリックしてください (エキスパートモード)
-WarningUpgrade=警告:\n最初にデータベースのバックアップを実行しましたか？\nこれは強く推奨されます: 例えば、データベースシステムのバグ (例えば、mysql バージョン5.5.40/41/42/43) のために、このプロセス中にデータやテーブルが失われる可能性があります。 そのため移行を開始する前にデータベースを完全にダンプすることを強くお勧めします。\n\nOK をクリックすると、移行プロセスを開始します...
-ErrorDatabaseVersionForbiddenForMigration=データベースのバージョンは %s です。 移行プロセスで必要となるような、データベースの構造変更を行うと、データの損失を引き起こす重大なバグがあります。 その理由から、データベースをより新しい修正バージョンにアップグレードするまで、移行は許可されません (既知のバグのバージョンのリスト: %s)
-KeepDefaultValuesWamp=あなたがDoliWampからDolibarrセットアップ·ウィザードを使用するので、ここで提案する値は、既に最適化されています。あなたは何をすべきか分かっている場合にのみ、それらを変更します。
-KeepDefaultValuesDeb=あなたは、Linuxパッケージ（Ubuntuのは、Debian、Fedoraの...）からDolibarrセットアップ·ウィザードを使用するので、ここで提案値がすでに最適化されています。作成するデータベースの所有者のパスワードのみを完了する必要があります。あなたは何をすべきか分かっている場合にのみ、他のパラメータを変更します。
-KeepDefaultValuesMamp=あなたがDoliMampからDolibarrのセットアップウィザードを使用して、ここで提案するので、値がすでに最適化されています。あなたは何をすべきか分かっている場合にのみ、それらを変更してください。
-KeepDefaultValuesProxmox=あなたがProxmox仮想アプライアンスからDolibarrのセットアップウィザードを使用して、ここで提案するので、値がすでに最適化されています。あなたは何をすべきか分かっている場合にのみ、それらを変更してください。
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=商用の提案のためのデータ移行
 MigrationInvoice=顧客の請求書のデータ移行
 MigrationContract=契約のためのデータ移行
-MigrationSuccessfullUpdate=アップグレードに成功しました
+MigrationSuccessfullUpdate=成功したアップグレード
 MigrationUpdateFailed=失敗したアップグレード·プロセス
 MigrationRelationshipTables=関係テーブルのデータ移行（%s）
 MigrationPaymentsUpdate=支払データ補正
@@ -163,9 +164,9 @@ MigrationContractsUpdate=契約データの補正
 MigrationContractsNumberToUpdate=更新する%s契約（複数可）
 MigrationContractsLineCreation=契約のref %sの契約回線を作成します。
 MigrationContractsNothingToUpdate=行うにこれ以上のもの
-MigrationContractsFieldDontExist=フィールドのfk_factureはもはや存在しません。は何の関係もない。
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=契約空の日付の訂正
-MigrationContractsEmptyDatesUpdateSuccess=契約の空の日付修正を正常に完了しました
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=修正する契約空の日ない
 MigrationContractsEmptyCreationDatesNothingToUpdate=修正するためには契約の作成日付ません
 MigrationContractsInvalidDatesUpdate=不正な値の日付の契約補正
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=配信のアップデート
 MigrationStockDetail=製品の在庫の値を更新
 MigrationMenusDetail=動的メニューのテーブルを更新
 MigrationDeliveryAddress=出荷の配信アドレスを更新
-MigrationProjectTaskActors=llx_projet_task_actorsテーブルのデータ移行
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=llx_projetのデータマイグレーション分野fk_user_resp llx_element_contactへ
 MigrationProjectTaskTime=更新時間は秒単位で過ごした
 MigrationActioncommElement=アクション上でデータを更新する
 MigrationPaymentMode=支払い·モードのデータ移行
 MigrationCategorieAssociation=カテゴリの移行
-MigrationEvents=イベントを移行して、イベントの所有者を割当て表に追加します
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=llx_societe_remise のエンティティフィールド値を更新
 MigrationRemiseExceptEntity=llx_societe_remise_except のエンティティフィールド値を更新
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=モジュール %s を再読み込み
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=利用できないオプションを表示しない
-HideNotAvailableOptions=利用できないオプションを非表示
-ErrorFoundDuringMigration=移行プロセス中にエラーが報告されたので、次のステップは利用できません。 エラーを無視するには、<a href="%s">ここをクリック</a> してください。ただし、修正されるまでアプリケーションまたは一部の機能が正しく動作しない場合があります。
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index b77a12131d5..a29ffd9df22 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=このサードパーティの連絡先/ adresses
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=このサードパーティに関するイベント
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=このメンバーに関するイベント
 ActionsOnProduct=Events about this product
 NActionsLate=%s後半
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=ウェブサイト
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 0e38e37a3c5..d9e958e64c3 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -83,6 +83,7 @@ LinkedObject=リンクされたオブジェクト
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=タイトル
 WEBSITE_DESCRIPTION=説明
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index d541192e8c0..3b26a96836e 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBoxモジュールのセットアップ
 PayBoxDesc=このモジュールは、上の支払いを可能にするためにページを提供して<a href="http://www.paybox.com" target="_blank">切符売り場</a>の顧客によって。これはフリーの支払いのためにまたは特定のDolibarrオブジェクトの支払いに用いることができる（請求書、発注、...）
 FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能です
 PaymentForm=支払い形態
-WelcomeOnPaymentPage=ようこそ私たちのオンライン決済サービスについて
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができます。
 ThisIsInformationOnPayment=これは、実行する支払いに関する情報です。
 ToComplete=完了する
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=顧客の請求書の%sオンライン決
 ToOfferALinkForOnlinePaymentOnContractLine=契約回線の%sオンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnFreeAmount=空き容量のため夜中オンライン決済のユーザインタフェースを提供するためのURL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=メンバーのサブスクリプションの%sオンライン決済のユーザインタフェースを提供するためのURL
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=また、独自の支払いコメントタグを追加するには、それらのURL（無料支払のためにのみ必要）のいずれかにurlパラメータ<b>·タグ= <i>値を</i></b>追加<i><b>する</b></i>こと<i><b>が</b></i>できます。
-SetupPayBoxToHavePaymentCreatedAutomatically=切符売り場で検証したときに自動的に作成支払いを持っているのurl <b>%s</b>を使用して切符売り場をセットアップします。
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認します。ありがとうございます。
-YourPaymentHasNotBeenRecorded=あなたの支払は記録されていないトランザクションがキャンセルされました。ありがとうございます。
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index 8c5bf22023c..8f1fa54b614 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=（要請求）署名
 PropalStatusNotSigned=（クローズ）署名されていません
 PropalStatusBilled=請求
 PropalStatusDraftShort=ドラフト
-PropalStatusValidatedShort=検証
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=閉じた
 PropalStatusSignedShort=署名された
 PropalStatusNotSignedShort=署名されていない
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propalの%sが見つかりません
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=既存のプロポーザルをコピーして、商用の提案を作成します。
-CreateEmptyPropal=空の商業的提案のビエルヘを作成するか、または製品/サービスのリストから
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=デフォルトの商業提案の有効期間（日数）
-UseCustomerContactAsPropalRecipientIfExist=提案受信者のアドレスとして、サードパーティのアドレスの代わりに定義されている場合、顧客の連絡先アドレスを使用する
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=商業的提案のクローンを作成する
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=顧客の連絡先フォローアップ提
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=完全な提案モデル（logo. ..）
+DocModelCyanDescription=完全な提案モデル（logo. ..）
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 356babdafff..3659f3b55ce 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=コー​​ド
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=ウェブサイトを削除
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=ホームページに設定する
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=読む
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 08508d4e6e8..8d6e8e39b04 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 1d42581c344..37a1d03a2d3 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index f76ff018f9d..ed988d580e2 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/ka_GE/commercial.lang
+++ b/htdocs/langs/ka_GE/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ka_GE/dict.lang b/htdocs/langs/ka_GE/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/ka_GE/dict.lang
+++ b/htdocs/langs/ka_GE/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/ka_GE/ecm.lang
+++ b/htdocs/langs/ka_GE/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ka_GE/help.lang b/htdocs/langs/ka_GE/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/ka_GE/help.lang
+++ b/htdocs/langs/ka_GE/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 100a249f418..b3ea678aea0 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/ka_GE/paybox.lang b/htdocs/langs/ka_GE/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/ka_GE/paybox.lang
+++ b/htdocs/langs/ka_GE/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/ka_GE/propal.lang b/htdocs/langs/ka_GE/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/ka_GE/propal.lang
+++ b/htdocs/langs/ka_GE/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 7877dfc26e7..5495940c56a 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 7614e914567..b11574a2c85 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=ಪೂರೈಕೆದಾರರು
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 6828726371c..2e846c6bfb2 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index d61f6d687ca..c354f967dfd 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=ಮುಚ್ಚಲಾಗಿದೆ
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=ಇತರ
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=ಪರಿಶೀಲಿಸಿ
 PaymentTypeShortCHQ=ಪರಿಶೀಲಿಸಿ
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=ಬ್ಯಾಂಕ್ ವಿವರಗಳು
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 457b57bd1aa..8c8660164c8 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=ಸಂಸ್ಥೆಯನ್ನು ತೋರಿಸಿ
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/kn_IN/commercial.lang b/htdocs/langs/kn_IN/commercial.lang
index f60ece73caa..1bfdaacab8c 100644
--- a/htdocs/langs/kn_IN/commercial.lang
+++ b/htdocs/langs/kn_IN/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=ನಿರೀಕ್ಷಿತರ ಸ್ಥಿತಿ
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/kn_IN/dict.lang b/htdocs/langs/kn_IN/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/kn_IN/dict.lang
+++ b/htdocs/langs/kn_IN/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/kn_IN/ecm.lang
+++ b/htdocs/langs/kn_IN/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/kn_IN/help.lang b/htdocs/langs/kn_IN/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/kn_IN/help.lang
+++ b/htdocs/langs/kn_IN/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index e1165452ff3..e068511b630 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index ba9958da1e5..53af6c5beec 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=ಶೀರ್ಷಿಕೆ
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/kn_IN/paybox.lang b/htdocs/langs/kn_IN/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/kn_IN/paybox.lang
+++ b/htdocs/langs/kn_IN/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang
index 03afb69a923..8d51cf1d00a 100644
--- a/htdocs/langs/kn_IN/propal.lang
+++ b/htdocs/langs/kn_IN/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=ಮುಚ್ಚಲಾಗಿದೆ
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 68b7f3d0f6c..0e432a8eecf 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=상업용
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=인보이스
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=공급 업체
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 6b240d14f8b..d8a5177d742 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=부터
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 62e16f3d837..0c36c11ace3 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=결제 금액
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=초안
 BillShortStatusPaid=유료
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=유료
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=확인 됨
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=닫은
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=유효성을 검사하기
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=부터
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=다른
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=검사
 PaymentTypeShortCHQ=검사
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=초안
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=은행 계좌 정보
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=대다
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 2a4bfdf4155..756805ae230 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang
index f7bb7c5b202..8440cb2f5bb 100644
--- a/htdocs/langs/ko_KR/commercial.lang
+++ b/htdocs/langs/ko_KR/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=전화 호출
 ActionAC_FAX=팩스 전송
 ActionAC_PROP=메일로 제안서 보내기
 ActionAC_EMAIL=이메일 전송
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=회의
 ActionAC_INT=현장 개입
 ActionAC_FAC=메일로 고객 송장 보내기
@@ -72,8 +73,8 @@ StatusProsp=잠재 고객 상태
 DraftPropals=상업적 제안 초안
 NoLimit=제한 없음
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ko_KR/dict.lang b/htdocs/langs/ko_KR/dict.lang
index 3b695e58dbe..017b87e859a 100644
--- a/htdocs/langs/ko_KR/dict.lang
+++ b/htdocs/langs/ko_KR/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=라오스
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
index c99b6129c2b..e08408c17f9 100644
--- a/htdocs/langs/ko_KR/ecm.lang
+++ b/htdocs/langs/ko_KR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ko_KR/help.lang b/htdocs/langs/ko_KR/help.lang
index 0dd31e27efe..6775a0fa1c7 100644
--- a/htdocs/langs/ko_KR/help.lang
+++ b/htdocs/langs/ko_KR/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=상업용
 TypeOfHelp=유형
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index 96ffa4a8ebf..87da570b5ff 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=이파리
-CPTitreMenu=이파리
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=시작일
 DateFinCP=종료일
@@ -15,13 +15,18 @@ ApprovedCP=승인됨
 CancelCP=취소 된
 RefuseCP=거절됨
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=기술
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=편집하다
 DeleteCP=지우다
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=이유
 UserCP=사용자
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index f93d9e9c28a..14a94b6268d 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=단계별로 지시에 따라 해보세요.
 MiscellaneousChecks=설치 조건 확인
 ConfFileExists=설치 파일 <b>%s</b>을/를 확인하세요.
-ConfFileDoesNotExistsAndCouldNotBeCreated=설치 파일 <b>%s</b>이 없거나 작성되지 않았습니다!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=설치 파일<b>%s</b>이 작성되지 않았습니다.
-ConfFileIsNotWritable=설치 파일 <b>%s</b>을/를 사용할 수 없습니다. 사용권한을 확인하세요. 우선 설치를 하려면, 웹 서버에서 설치 과정에 필요한  이 파일을 사용할 수 있는 권한이 있어야 합니다 (예: 리눅스 같은 OS에서 "chmod 666").
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=설정 파일 <b>%s</b>을/를 사용할 수 있습니다.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=설정 파일에 필요한 모든 정보를 다시 로딩합니다.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=이 PHP는 세션을 지원합니다.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 08503bb515d..ff520cd5f37 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=이 협력업체의 연락처
 ContactsAddressesForCompany=이 협력업체의 연락처 / 주소
 AddressesForCompany=이 협력업체의 주소
 ActionsOnCompany=이 협력업체에 대한 이벤트
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=이 멤버에 대한 이벤트
 ActionsOnProduct=Events about this product
 NActionsLate=%s 늦게
@@ -847,9 +848,9 @@ ModuleBuilder=모듈 빌더
 SetMultiCurrencyCode=통화 설정
 BulkActions=벌크 작업
 ClickToShowHelp=툴팁 도움말을 보려면 클릭하십시오.
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=경비 보고서
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 4c7b15096e1..2c071cefa30 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=표제
 WEBSITE_DESCRIPTION=기술
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/ko_KR/paybox.lang b/htdocs/langs/ko_KR/paybox.lang
index 4294117e383..f8db1287738 100644
--- a/htdocs/langs/ko_KR/paybox.lang
+++ b/htdocs/langs/ko_KR/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
index b97f48eaecd..c278e5ff081 100644
--- a/htdocs/langs/ko_KR/propal.lang
+++ b/htdocs/langs/ko_KR/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=초안
-PropalStatusValidatedShort=확인 함
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=닫은
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index adc1c2f4f10..21a1403df65 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=암호
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index a9672281edb..d352b3642d3 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=ບັນ​ຊີ
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 82d0ee7cc07..1fae4489cd5 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -7,7 +7,7 @@ BankName=ຊື່ທະນາຄານ
 FinancialAccount=ບັນຊີ
 BankAccount=ບັນຊີທະນາຄານ
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index f76ff018f9d..ed988d580e2 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/lo_LA/commercial.lang b/htdocs/langs/lo_LA/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/lo_LA/commercial.lang
+++ b/htdocs/langs/lo_LA/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/lo_LA/dict.lang b/htdocs/langs/lo_LA/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/lo_LA/dict.lang
+++ b/htdocs/langs/lo_LA/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/lo_LA/ecm.lang
+++ b/htdocs/langs/lo_LA/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/lo_LA/help.lang b/htdocs/langs/lo_LA/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/lo_LA/help.lang
+++ b/htdocs/langs/lo_LA/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index 01b9ed7d1e0..8155e8b94d2 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=ລຶບ
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 6a538fa0b5a..580f58d7794 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 9530df0a502..363bfed21af 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/lo_LA/paybox.lang b/htdocs/langs/lo_LA/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/lo_LA/paybox.lang
+++ b/htdocs/langs/lo_LA/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/lo_LA/propal.lang
+++ b/htdocs/langs/lo_LA/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 10a2c81b6b5..0ba9935cbb0 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funkcija išjungta demo versijoje
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Rodomi tik elementai iš <a href="%s">leidžiami moduliai</a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modulių įrankiai
 ModuleFamilyExperimental=Eksperimentiniai moduliai
 ModuleFamilyFinancial=Finansiniai moduliai (Accounting/Treasury)
 ModuleFamilyECM=Elektroninis Turinio Valdymas (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Meniu prižiūrėtojai
 MenuAdmin=Meniu redaktorius
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Vartotojai ir grupės
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Įmonių ir kontaktų valdymas (klientų, perspektyvų...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Prekybos
 Module2Desc=Komercinis valdymas
 Module10Name=Apskaita
@@ -501,7 +501,7 @@ Module23Desc=Stebėti energijos suvartojimą
 Module25Name=Klientų užsakymai
 Module25Desc=Klientų užsakymų valdymas
 Module30Name=Sąskaitos
-Module30Desc=Sąskaitų ir kreditinių sąskaitų valdymas klientams. Sąskaitų valdymas tiekėjams
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Tiekėjai
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=PVM tarifai ar Pardavimo mokesčio tarifai
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Apmokėjimo terminai
 DictionaryPaymentModes=Apmokėjimo būdai
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Eco-Tax (WEEE)
 DictionaryPaperFormat=Popieriaus formatai
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Vietinių mokesčių ataskaitos yra pardavimo vietinių mokes
 LabelUsedByDefault=Etiketė naudojamas pagal nutylėjimą, jei kodui nerandamas vertimas
 LabelOnDocuments=Dokumentų etiketė
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Mėnesio pabaigoje
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Saugumo audito įvykiai
-Audit=Auditas
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Naršyklės pavadinimas
 BrowserOS=Naršyklės OS
 ListOfSecurityEvents=Dolibarr saugumo įvykių sąrašas
 SecurityEventsPurged=Saugumo įvykiai išvalyti
-LogEventDesc=Čia galite leisti prisijungimą prie Dolibarr saugumo įvykių. Administratoriai gali matyti turinį per meniu <b>System Tools - Audit</b>. Įspėjimas, ši funkcija gali užimti didelį kiekį duomenų bazės atminties ir sulėtinti darbą.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
 SystemAreaForAdminOnly=Ši sritis yra skirta tik administratoriams. Nė vienas iš Dolibarr leidimų negali sumažinti šio apribojimo.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Produkto grynoji vieneto kaina
 TotalPriceAfterRounding=Bendra kaina (grynoji kaina/PVM/su PVM) po apvalinimo
 ParameterActiveForNextInputOnly=Parametras veiksmingas tik kitam duomenų įvedimui
-NoEventOrNoAuditSetup=Dar nėra užfiksuotų saugumo įvykių. Tai yra normalu, jei auditas nebuvo įjungtas "Nuostatos - Saugumas - Auditas" puslapyje.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Žiūrėti į vietinio el. pašto konfigūraciją
 BackupDesc=Norint padaryti pilną atsarginę Dolibarr kopiją, reikia:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Papildomos savybės (užsakymo eilutės)
 ExtraFieldsSupplierInvoicesLines=Papildomos savybės (sąskaitos-faktūros eilutės)
 ExtraFieldsThirdParties=Papildomi požymiai (trečiosios šalys)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Papildomi požymiai (narys)
 ExtraFieldsMemberType=Papildomi požymiai (nario tipas)
 ExtraFieldsCustomerInvoices=Papildomi atributai (sąskaitos-faktūros)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Fiksuotų pranešimų sąrašas
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Slenkstis
 BackupDumpWizard=Duomenų bazės atsarginės kopijos failo kūrimo vedlys
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Pašto kodas
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 7cf423a63f8..eed0e0f8ec8 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -7,7 +7,7 @@ BankName=Banko pavadinimas
 FinancialAccount=Sąskaita
 BankAccount=Banko sąskaita
 BankAccounts=Banko sąskaitos
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Rodyti sąskaitą
 AccountRef=Finansinės sąskaitos nuoroda
 AccountLabel=Finansinės sąskaitos etiketė
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Sąskaitos adresas
 BankAccountCountry=Sąskaitos šalis
 BankAccountOwner=Sąskaitos savininko vardas/pavadinimas
 BankAccountOwnerAddress=Sąskaitos savininko adresas
-RIBControlError=Verčių integralumo patikrinimas nepavyksta. Tai reiškia, kad informacija apie šitos sąskaitos numerį yra nepilna arba klaidinga (patikrinkite šalį, numerius ir IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Sukurti sąskaitą
 NewBankAccount=Naujas sąskaita
 NewFinancialAccount=Nauja finansinė sąskaita
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Gali būti suderintos
 Conciliate=Suderinti
 Conciliation=Suderinimas
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Įtraukti uždarytas sąskaitas
 OnlyOpenedAccount=Tik atidarytos sąskaitos
@@ -104,7 +105,7 @@ SocialContributionPayment=Socialinio / fiskalinio mokesčio mokėjimas
 BankTransfer=Banko pervedimas
 BankTransfers=Banko pervedimai
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Iš
 TransferTo=Į
 TransferFromToDone=Pervedimas <b>%s</b> iš <b>%s</b> į <b>%s</b> užregistruotas.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banko čekiai
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Rodyti čekio depozito kvitą
-NumberOfCheques=Čekio numeris
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Atgal į sąskaitą
 ShowAllAccounts=Rodyti visas sąskaitas
-FutureTransaction=Operacija ateityje. Negalima taikyti
-SelectChequeTransactionAndGenerate=Pasirinkti/filtruoti čekius, kad įtraukti į čekio depozito kvitą ir paspausti mygtuką "Sukurti".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Pasirinkti banko ataskaitą, susijusią su taikymu. Naudokite rūšiuojamą skaitmeninę reikšmę: YYYYMM arba YYYYMMDD
 EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Čekio grąžinimo data
 CheckRejected=Čekis grąžintas
 CheckRejectedAndInvoicesReopened=Čekis grąžintas ir sąskaita iš naujo atidaryta
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 939eec69de2..a72ebfce395 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Sąskaita-faktūra
+Bill=PVM Sąskaita-faktūra
 Bills=Sąskaitos-faktūros
-BillsCustomers=Customer invoices
+BillsCustomers=Klientų sąskaitos faktūros
 BillsCustomer=Kliento sąskaita-faktūra
-BillsSuppliers=Supplier invoices
+BillsSuppliers=Tiekėjo sąskaitos faktūros
 BillsCustomersUnpaid=Neapmokėtos kliento sąskaitos
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Nesumokėtos kliento sąskaitos už %s
 BillsSuppliersUnpaid=Neapmokėtos tiekėjo sąskaitos
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Neapmokamos tiekėjo sąskaitos už %s
 BillsLate=Pavėluoti mokėjimai
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatistics=Klientų sąskaitų faktūrų statistika
+BillsStatisticsSuppliers=Tiekėjų sąskaitų faktūrų statistika
+DisabledBecauseDispatchedInBookkeeping=Išjungta, nes sąskaita faktūra buvo išsiųsta į apskaitą
+DisabledBecauseNotLastInvoice=Neleidžiama, nes sąskaita faktūra nėra ištrinama. Kai kurios sąskaitos faktūros buvo užfiksuotos po tokio veiksmo, kai jos sukurs skyles skaitiklyje.
+DisabledBecauseNotErasable=Neleidžiama, nes negalima ištrinti
 InvoiceStandard=Standartinė sąskaita-faktūra
 InvoiceStandardAsk=Standartinė sąskaita-faktūra
 InvoiceStandardDesc=Šio tipo sąskaita-faktūra yra bendra sąskaita-faktūra.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDeposit=Išankstinio apmokėjimo sąskaita
+InvoiceDepositAsk=Išankstinio apmokėjimo sąskaita
+InvoiceDepositDesc=Ši sąskaitos faktūra yra atlikta, kai gaunamas apmokėjimas.
 InvoiceProForma=Išankstinė (proforma) sąskaita-faktūra
 InvoiceProFormaAsk=išankstinė (proforma) sąskaita-faktūra
 InvoiceProFormaDesc=<b>Išankstinė sąskaita-faktūra</b> yra tikros sąskaitos forma, bet neatvaizduojama realioje apskaitoje.
 InvoiceReplacement=Sąskaitos-faktūros pakeitimas
 InvoiceReplacementAsk=Sąskaitos-faktūros pakeitimas sąskaita-faktūra
-InvoiceReplacementDesc=<b>Sąskaitos-faktūros pakeitimas</b> naudojamas atšaukti ir visiškai pakeisti gautą ir neapmokėtą sąskaitą-faktūrą.<br><br> Pastaba: Tik neapmokėtos sąskaitos-faktūros gali būti pakeičiamos. Jei sąskaita-faktūra, kurią keičiate, dar nėra uždaryta, ji bus automatiškai uždaryta ir pažymėta kaip  "neįvykusi".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Kreditinė sąskaita (kredito aviza)
 InvoiceAvoirAsk=Kreditinė sąskaita tikslinanti sąskaitą-faktūrą
-InvoiceAvoirDesc=<b>Kreditinė sąskaita</b> yra neigiama sąskaita-faktūra, naudojama išspręsti faktui, kai sąskaitos-faktūros suma realiai skiriasi nuo sumokėtos sumos (nes klientas per klaidą sumokėjo per daug, ar ​​nesumokėjo pilnai, nes grąžino dalį produktų).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Sukurti kreditinę sąskaitą su eilutėmis iš originalios sąskaitos-faktūros
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Sukurkite kreditinę sąskaitą su neapmokėtu sąskaitos faktūros likučiu
+invoiceAvoirLineWithPaymentRestAmount=Kreditinė sąskaita likusiai nesumokėtai sumai
 ReplaceInvoice=Pakeisti sąskaitą %s
 ReplacementInvoice=Sąskaitos-faktūros pakeitimas
 ReplacedByInvoice=Pakeistas sąskaita %s
@@ -43,11 +43,11 @@ ConsumedBy=Suvartota
 NotConsumed=Nesuvartota
 NoReplacableInvoice=Nėra keičiamų sąskaitų-faktūrų
 NoInvoiceToCorrect=Nėra koreguojamų sąskaitų-faktūrų
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Buvo šaltinis vienai ar kelioms kreditinėms sąskaitoms
 CardBill=Sąskaitos-faktūros kortelė
 PredefinedInvoices=Iš anksto apibrėžtos sąskaitos-faktūros
-Invoice=Sąskaita-faktūra
-PdfInvoiceTitle=Sąskaita-faktūra
+Invoice=PVM Sąskaita-faktūra
+PdfInvoiceTitle=PVM Sąskaita-faktūra
 Invoices=Sąskaitos-faktūros
 InvoiceLine=Sąskaitos-faktūros linija
 InvoiceCustomer=Kliento sąskaita-faktūra
@@ -65,13 +65,13 @@ PaymentsBack=Mokėjimai atgal (grąžinimai)
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Sumokėta atgal (grąžinta)
 DeletePayment=Ištrinti mokėjimą
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmDeletePayment=Ar tikrai norite ištrinti šį mokėjimą?
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Tiekėjų mokėjimai
 ReceivedPayments=Gauti mokėjimai
 ReceivedCustomersPayments=Iš klientų gauti mokėjimai
-PayedSuppliersPayments=Mokėjimai sumokėti tiekėjams
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Gauti klientų mokėjimai tikrinimui ir pripažinimui galiojančiais
 PaymentsReportsForYear=Mokėjimų ataskaitos %s
 PaymentsReports=Mokėjimų ataskaitos
@@ -79,11 +79,11 @@ PaymentsAlreadyDone=Jau atlikti mokėjimai
 PaymentsBackAlreadyDone=Jau atlikti mokėjimai atgal (grąžinimai)
 PaymentRule=Mokėjimo taisyklė
 PaymentMode=Mokėjimo būdas
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debetinė / Kreditinė kortelė
 PaymentTypePP=PayPal
-IdPaymentMode=Payment type (id)
-CodePaymentMode=Payment type (code)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Mokėjimo tipas (id)
+CodePaymentMode=Mokėjimo tipas (kodas)
+LabelPaymentMode=Mokėjimo tipas (etiketė)
 PaymentModeShort=Mokėjimo būdas
 PaymentTerm=Mokėjimo terminas
 PaymentConditions=Apmokėjimo terminai
@@ -91,68 +91,69 @@ PaymentConditionsShort=Apmokėjimo terminai
 PaymentAmount=Mokėjimo suma
 ValidatePayment=Mokėjimą pripažinti galiojančiu
 PaymentHigherThanReminderToPay=Mokėjimas svarbesnis už priminimą sumokėti
-HelpPaymentHigherThanReminderToPay=Dėmesio, vienos ar kelių sąskaitų mokėjimo suma yra didesnė nei reikalingas sumokėti likutis.<br> Redaguokite įvedimą, arba patvirtinkite ir galvokite apie kreditinės sąskaitos kūrimą gautam perviršiui nuo kiekvienos permokėtos sąskaitos.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Priskirti 'Apmokėtos'
 ClassifyPaidPartially=Priskirti 'Dalinai apmokėtos'
 ClassifyCanceled=Priskirti 'Neįvykusios'
 ClassifyClosed=Priskirti 'Uždarytos'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Klasifikuoti "Neapmokėtos"
 CreateBill=Sukurti sąskaitą-faktūrą
 CreateCreditNote=Sukurti kreditinę sąskaitą
-AddBill=Create invoice or credit note
+AddBill=Sukurti sąskaitą arba kreditinę sąskaitą
 AddToDraftInvoices=Pridėti į projektinę sąskaitą-faktūrą
 DeleteBill=Ištrinti sąskaitą-faktūrą
 SearchACustomerInvoice=Ieškoti kliento sąskaitos-faktūros
 SearchASupplierInvoice=Ieškoti tiekėjo sąskaitos-faktūros
 CancelBill=Atšaukti sąskaitą-faktūrą
 SendRemindByMail=Siųsti priminimą e-paštu
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+DoPayment=Įveskite mokėjimą
+DoPaymentBack=Įveskite grąžinimą
+ConvertToReduc=Pažymėti kaip kreditą
+ConvertExcessReceivedToReduc=Konvertuoti gautą perviršį į turimą kreditą
+ConvertExcessPaidToReduc=Perskaičiuoti permokėtą sumą į turimą nuolaidą
 EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
 EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Neleidžiama, nes neapmokėtas likutis yra nulinis
 PriceBase=Kainos bazė
 BillStatus=Sąskaitos-faktūros būklė
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Sugeneruotų sąskaitų faktūrų būsena
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
 BillStatusPaid=Apmokėtas
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Kreditinės sąskaitos lėšų grąžinimas arba pažymėtas kaip kreditas
+BillStatusConverted=Sumokėta (paruošta naudoti galutinėje sąskaitoje faktūroje)
 BillStatusCanceled=Neįvykęs
 BillStatusValidated=Pripažintas galiojančiu (turi būti apmokėtas)
 BillStatusStarted=Pradėtas
 BillStatusNotPaid=Neapmokėta
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Negrąžinamas
 BillStatusClosedUnpaid=Uždaryta (neapmokėta)
 BillStatusClosedPaidPartially=Dalinai apmokėta
 BillShortStatusDraft=Projektas
 BillShortStatusPaid=Apmokėta
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Apmokėtas
 BillShortStatusCanceled=Neįvykusi
 BillShortStatusValidated=Pripažinta galiojančia
 BillShortStatusStarted=Pradėta
 BillShortStatusNotPaid=Neapmokėta
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Negrąžintas
 BillShortStatusClosedUnpaid=Uždaryta
 BillShortStatusClosedPaidPartially=Dalinai apmokėta
 PaymentStatusToValidShort=Pripažinti galiojančia
-ErrorVATIntraNotConfigured=Vidinis PVM numeris nėra apibrėžtas
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Mokėjimo būdas pagal nutylėjimą nėra apibrėžtas. Eiti į Sąskaitų-faktūrų modulio nustatymus išspręsti šią problemą.
 ErrorCreateBankAccount=Sukurti banko sąskaitą, tada eiti į Nustatymų meniu Sąskaitų-faktūrų modulį ir apibrėžti mokėjimo būdus
 ErrorBillNotFound=Sąskaita-faktūra %s neegzistuoja
-ErrorInvoiceAlreadyReplaced=Klaida, Jūs bandote pripažinti galiojančia sąskaitą-faktūrą ir ja pakeisti sąskaitą-faktūrą %s. Bet ši jau anksčiau buvo pakeista sąskaita-faktūra: %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Klaida, nuolaida jau panaudota
 ErrorInvoiceAvoirMustBeNegative=Klaida, teisinga sąskaita-faktūra turi turėti neigiamą sumą
 ErrorInvoiceOfThisTypeMustBePositive=Klaida, šis sąskaitos-faktūros tipas turi turėti teigiamą sumą
 ErrorCantCancelIfReplacementInvoiceNotValidated=Klaida negalima atšaukti sąskaitos-faktūros, kuri buvo pakeista kita sąskaita-faktūra, kuri vis dar yra projektinėje būklėje
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
-BillFrom=Iš
-BillTo=Į
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=Pardavėjas
+BillTo=Pirkėjas
 ActionsOnBill=Veiksmai sąskaitoje-faktūroje
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
@@ -173,26 +174,26 @@ CustomersDraftInvoices=Customer draft invoices
 SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Neapmokėta
 ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmValidateBill=Ar tikrai norite patvirtinti šią sąskaitą su nuoroda <b> %s </ b>?
 ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
 ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Nesumokėtas likutis <b> (%s %s) </ b> yra nuolaida, nes mokėjimas buvo atliktas prieš terminą.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Nesumokėtas likutis <b> (%s %s) </ b> yra nuolaida, nes mokėjimas buvo atliktas prieš terminą. Sutinku prarasti PVM su šia nuolaida.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Nesumokėtas likutis <b> (%s %s) </ b> yra nuolaida, nes mokėjimas buvo atliktas prieš terminą. Aš susigrąžinu PVM su šia nuolaida be kreditinės sąskaitos.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Blogas klientas
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produktų dalis grąžinta
 ConfirmClassifyPaidPartiallyReasonOther=Suma atsisakyta dėl kitų priežasčių
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Šis pasirinkimas yra įmanomas, jei jūsų sąskaita-faktūra buvo pateikta su tinkama pastaba. (Pvz.:"Tik mokesčiai, susiję su kaina, kuri buvo faktiškai sumokėta, suteikia teises į išskaitą")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Kai kuriose šalyse, šis pasirinkimas galimas tik tada, jei jūsų sąskaita-faktūra turi tinkamą pastabą.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Naudokite šį pasirinkimą, jei visi kiti netinka
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Blogas klientas</b> yra klientas, kad atsisako apmokėti savo skolą.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Šis pasirinkimas yra naudojamas, kai mokėjimas neatliktas, nes kai kurie produktai buvo grąžinti
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Naudokite šį pasirinkimą, jei visi kiti netinka, pvz., šiais atvejais: <br>- Apmokėjimas neatliktas, nes kai kurie produktai buvo išsiųsti atgal<br>- Reikalaujama suma pernelyg svarbi, nes nuolaida buvo pamiršta <br>Visais atvejais per didelė reikalaujama suma turi būti ištaisyta apskaitos sistemoje sukuriant kreditinę sąskaitą.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Kita
 ConfirmClassifyAbandonReasonOtherDesc=Šis pasirinkimas bus naudojamas visais kitais atvejais. Pvz, kai jūs ketinate sukurti pakeičiančią sąskaitą-faktūrą.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Sąskaitą-faktūrą pripažinti galiojančia
 UnvalidateBill=Sąskaitą-faktūra pripažinti negaliojančia
-NumberOfBills=Sąskaitų-faktūrų skaičius
-NumberOfBillsByMonth=Sąskaitų-faktūrų skaičius pagal mėnesius
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Sąskaitų-faktūrų suma
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Sąskaitų-faktūrų suma pagal mėnesius (atskaičius mokesčius)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Rodyti sąskaitą-faktūrą
@@ -214,14 +216,14 @@ ShowInvoiceSituation=Show situation invoice
 ShowPayment=Rodyti mokėjimą
 AlreadyPaid=Jau apmokėta
 AlreadyPaidBack=Mokėjimas jau grąžintas
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidNoCreditNotesNoDeposits=Jau sumokėta (be kreditinių sąskaitų ir pradinės įmokos)
 Abandoned=Neįvykusi
-RemainderToPay=Remaining unpaid
+RemainderToPay=Nesumokėtas likutis
 RemainderToTake=Remaining amount to take
 RemainderToPayBack=Remaining amount to refund
 Rest=Laukiantis
 AmountExpected=Reikalaujama suma
-ExcessReceived=Gautas perviršis
+ExcessReceived=Grąža
 ExcessPaid=Excess paid
 EscompteOffered=Siūloma nuolaida (mokėjimas prieš terminą)
 EscompteOfferedShort=Nuolaida
@@ -240,7 +242,7 @@ SendReminderBillByMail=Siųsti priminimą e-paštu
 RelatedCommercialProposals=Susiję komerciniai pasiūlymai
 RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Įteisinti
-DateMaxPayment=Payment due on
+DateMaxPayment=Numatytas apmokėjimo terminas
 DateInvoice=Sąskaitos-faktūros data
 DatePointOfTax=Point of tax
 NoInvoice=Nėra sąskaitos-faktūros
@@ -258,17 +260,17 @@ RepeatableInvoices=Template invoices
 Repeatable=Template
 Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Klientų sąskaitos-faktūros ir sąskaitų-faktūrų serijos
+CreateRepeatableInvoice=Sukurti sąskaitos faktūros šabloną
+CreateFromRepeatableInvoice=Sukurkite sąskaitos faktūros pagal ruošinį
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Kliento sąskaitos-faktūros ir mokėjimai
-ExportDataset_invoice_1=Kliento sąskaitų-faktūrų sąrašas ir sąskaitų-faktūros serijos
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Kliento sąskaitos-faktūros ir mokėjimai
 ProformaBill=Išankstinė sąskaita:
-Reduction=Sumažinimas
-ReductionShort=Mažinimo.
-Reductions=Sumažinimai
-ReductionsShort=Mažinimo.
+Reduction=Nuolaida
+ReductionShort=Nuol.
+Reductions=Nuolaidos
+ReductionsShort=Nuol.
 Discounts=Nuolaidos
 AddDiscount=Sukurti nuolaidą
 AddRelativeDiscount=Sukurti susijusią nuolaidą
@@ -286,11 +288,11 @@ CreditNotesOrExcessReceived=Credit notes or excess received
 Deposit=Down payment
 Deposits=Down payments
 DiscountFromCreditNote=Nuolaida kreditinei sąskaitai %s
-DiscountFromDeposit=Down payments from invoice %s
+DiscountFromDeposit=Pradinis mokėjimas iš sąskaitos faktūros %s
 DiscountFromExcessReceived=Payments in excess of invoice %s
 DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ši kredito rūšis gali būti naudojama sąskaitai-faktūrai prieš ją pripažįstant galiojančia
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=Sąskaita faktūra turi būti patvirtinta, kad būtų galima naudoti šio tipo kreditus
 NewGlobalDiscount=Nauja absoliutinė nuolaida
 NewRelativeDiscount=Naujas susijusi nuolaida
 DiscountType=Discount type
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Sąskaitos adresas
-HelpEscompte=Ši nuolaida yra nuolaida suteikiama klientui, nes jo mokėjimas buvo atliktas prieš terminą.
-HelpAbandonBadCustomer=Šios sumos buvo atsisakyta (blogas klientas) ir ji yra laikoma išimtiniu nuostoliu.
-HelpAbandonOther=Šios sumos buvo atsisakyta, nes tai buvo klaida (pvz.: neteisingas klientas arba sąskaita-faktūra buvo pakeista kita)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Mokėjimo ID
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nėra pasirinktų sąskaitų-faktūrų
 CloneInvoice=Klonuoti sąskaitą-faktūrą
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Veiksmas išjungtas, nes sąskaita-faktūra buvo pakeista
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Mokėjimų numeriai
+DescTaxAndDividendsArea=Ši sritis parodo visų specialioms išlaidoms atliktų mokėjimų sumą. Čia įtraukiami tik fiksuotų vienerių metų įrašai.
+NbOfPayments=No. of payments
 SplitDiscount=Padalinti nuolaidą į dvi dalis
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Įveskite sumą kiekvienai iš dviejų dalių:
-TotalOfTwoDiscountMustEqualsOriginal=Dviejų naujų nuolaidų suma turi būti lygi pradinei nuolaidai.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Susijusi sąskaita-faktūra
 RelatedBills=Susiję sąskaitos-faktūros
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -351,25 +353,25 @@ FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
 FrequencyUnit=Frequency unit
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
+NextDateToExecution=Kita sąskaitos faktūros sukūrimo data
+NextDateToExecutionShort=Data kito gen.
+DateLastGeneration=Vėliausio generavimo data
+DateLastGenerationShort=Data vėliausio gen.
 MaxPeriodNumber=Max number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
+InvoiceAutoValidate=Automatiškai patvirtinti sąskaitas faktūras
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
+DateIsNotEnough=Data dar neįvykdyta
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
 # PaymentConditions
 Statut=Būklė
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Išankstinis mokėjimas
+PaymentConditionRECEP=Išankstinis mokėjimas
 PaymentConditionShort30D=30 dienų
 PaymentCondition30D=30 dienų
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -398,8 +400,8 @@ VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
 # PaymentType
 PaymentTypeVIR=Banko pervedimas
 PaymentTypeShortVIR=Banko pervedimas
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Tiesioginis mokėjimas į sąskaitą
+PaymentTypeShortPRE=Išankstinis mokėjimo pavedimas
 PaymentTypeLIQ=Grynieji pinigai
 PaymentTypeShortLIQ=Grynieji pinigai
 PaymentTypeCB=Kreditinė kortelė
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Čekis
 PaymentTypeShortCHQ=Čekis
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Tiesioginis mokėjimas (online)
-PaymentTypeShortVAD=Tiesioginis mokėjimas (online)
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Projektas
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Banko duomenys
 BankCode=Banko kodas
-DeskCode=Skyriaus kodas
+DeskCode=Office code
 BankAccountNumber=Sąskaitos numeris
-BankAccountNumberKey=Raktas
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN numeris
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT numeris
@@ -431,8 +433,8 @@ ChequeOrTransferNumber=Čekio/Pervedimo N°
 ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Čekio bankas
-CheckBank=Patikrinti
-NetToBePaid=Grynasis mokėjimas
+CheckBank=Čekis
+NetToBePaid=Mokėjimas grynaisiais
 PhoneNumber=Tel
 FullPhoneNumber=Telefonas
 TeleFax=Faksas
@@ -445,13 +447,13 @@ PaymentByTransferOnThisBankAccount=Apmokėjimas pavedimu į šią banko sąskait
 VATIsNotUsedForInvoice=* Netaikoma PVM art-293B iš CGI
 LawApplicationPart1=Taikant įstatymus 80,335 iš 12/05/80
 LawApplicationPart2=Prekės lieka nuosavybe
-LawApplicationPart3=Pardavėjas, iki pilno išgryninimo iš
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=jų kaina.
 LimitedLiabilityCompanyCapital=SARL su Kapitalu
 UseLine=Taikyti
 UseDiscount=Taikyti nuolaidą
 UseCredit=Taikyti kreditą
-UseCreditNoteInInvoicePayment=Sumažinti mokėjimo sumą su šiuo kreditu
+UseCreditNoteInInvoicePayment=Sumažinkite mokėtiną sumą naudodami šį kreditą
 MenuChequeDeposits=Čekių depozitai
 MenuCheques=Čekiai
 MenuChequesReceipts=Čekių įplaukos
@@ -463,32 +465,33 @@ Cheques=Čekiai
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Naudoti kliento kontaktinį adresą, o ne trečiosios šalies, kaip sąskaitų-faktūrų gavėjo, adresą
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Rodyti visas neapmokėtas sąskaitas-faktūras
 ShowUnpaidLateOnly=Rodyti tik vėluojančias neapmokėtas sąskaitas
 PaymentInvoiceRef=Mokėjimo sąskaita-faktūra %s
 ValidateInvoice=Sąskaitą-faktūrą pripažinti galiojančia
-ValidateInvoices=Validate invoices
+ValidateInvoices=Sąskaitas-faktūras pripažinti galiojančiomis
 Cash=Grynieji pinigai
 Reported=Uždelstas
 DisabledBecausePayments=Neįmanoma nuo tada, kai atsirado kai kurie mokėjimai
 CantRemovePaymentWithOneInvoicePaid=Negalima pašalinti mokėjimo, nuo tada kai čia yra bent viena sąskaita-faktūra priskirta apmokėtoms
 ExpectedToPay=Laukiamas mokėjimas
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Sumokėta šiuo mokėjimu
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Priskirtii "Apmokėta" visas pilnai grąžintas kreditines sąskaitas.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Visos sąskaitos-faktūros, neturinčios neapmokėto likučio bus automatiškai uždarytos ir perkeltos į "Apmokėta".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Mokėti
 ToMakePaymentBack=Grąžinti
 ListOfYourUnpaidInvoices=Sąrašas neapmokėtų sąskaitų-faktūrų
 NoteListOfYourUnpaidInvoices=Pastaba: Šis sąrašas rodo tik sąskaitas trečiosioms šalims, su kuriom Jūs susijęs kaip prekybos atstovas.
 RevenueStamp=Įplaukų rūšis
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Sąskaitos-faktūros PDF šablonas Crabe. Pilnas sąskaitos-faktūros šablonas (rekomenduojamas Šablonas)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Grąžinimo numeris formatu %syymm-nnnn standartinėms sąskaitoms-faktūroms ir %syymm-nnnn kreditinėms sąskaitoms, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grįžimo į 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -530,10 +533,10 @@ PDFCrevetteSituationInvoiceTitle=Situation invoice
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+updatePriceNextInvoiceErrorUpdateline=Klaida: atnaujinkite kainą sąskaitos faktūros eilutėje: %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -541,8 +544,9 @@ BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
+AutoFillDateFrom=Nustatykite paslaugų eilutės pradžios datą su sąskaitos faktūros data
+AutoFillDateFromShort=Nustatykite pradžios datą
+AutoFillDateTo=Nustatykite paslaugų eilutės pabaigos datą su kita sąskaitos faktūros data
+AutoFillDateToShort=Nustatykite pabaigos datą
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index f714455e7f2..a1b749d28fb 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -12,23 +12,33 @@ CashDeskOn=apie
 CashDeskThirdParty=Trečioji šalis
 ShoppingCart=Prekių krepšelis
 NewSell=Naujas pardavimas
-AddThisArticle=Pridėti šį straipsnį
+AddThisArticle=Pridėti šią prekę
 RestartSelling=Eiti atgal į pardavimą
-SellFinished=Sale complete
-PrintTicket=Spausdinti bilietą
-NoProductFound=Straipsnio nerasta
+SellFinished=Pardavimas baigtas
+PrintTicket=Spausdinti užsakymą
+NoProductFound=Prekė nerasta
 ProductFound=Produktas rastas
-NoArticle=Nėra straipsnio
+NoArticle=Nėra prekės
 Identification=Identifikacija
-Article=Straipsnis
+Article=Prekė
 Difference=Skirtumas
-TotalTicket=Visas bilietas
+TotalTicket=Visas užsakymas
 NoVAT=Šiam pardavimui nėra PVM
-Change=Gautas perviršis
-BankToPay=Account for payment
+Change=Grąža
+BankToPay=Sąskaita apmokėjimui
 ShowCompany=Rodyti įmonę
 ShowStock=Rodyti sandėlį
 DeleteArticle=Spustelėkite pašalinti šį straipsnį
 FilterRefOrLabelOrBC=Paieška (Nuoroda/Etiketė)
-UserNeedPermissionToEditStockToUsePos=Jūs prašote sumažinti atsargų kiekį sąskaitoje-faktūroje, todėl vartotojas, naudojantis POS turi turėti teisę redaguoti atsargas.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr įplaukų kvitų spausdintuvas
+PointOfSale=Pardavimo punktas
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang
index 9147927dfca..ca02f9e639a 100644
--- a/htdocs/langs/lt_LT/commercial.lang
+++ b/htdocs/langs/lt_LT/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefono skambutis
 ActionAC_FAX=Siųsti faksu
 ActionAC_PROP=Siųsti pasiūlymą paštu
 ActionAC_EMAIL=Siųsti e-laišką
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Susitikimai
 ActionAC_INT=Intervencija tinklapyje
 ActionAC_FAC=Siųsti kliento sąskaitą-faktūrą paštu
@@ -72,8 +73,8 @@ StatusProsp=Plano būklė
 DraftPropals=Komercinių pasiūlymų projektai
 NoLimit=Be apribojimų
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/lt_LT/dict.lang b/htdocs/langs/lt_LT/dict.lang
index feace182fd5..36dd7c76ac9 100644
--- a/htdocs/langs/lt_LT/dict.lang
+++ b/htdocs/langs/lt_LT/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Herdo ir Makdonaldo
 CountryVA=Šventasis Sostas (Vatikano Miesto Valstybė)
 CountryHN=Hondūras
 CountryHK=Honkongas
-CountryIS=Islandija
+CountryIS=Iceland
 CountryIN=Indija
 CountryID=Indonezija
 CountryIR=Iranas
@@ -131,7 +131,7 @@ CountryKI=Kiribatis
 CountryKP=Šiaurės Korėja
 CountryKR=Pietų Korėja
 CountryKW=Kuveitas
-CountryKG=Kirgizija
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvija
 CountryLB=Libanas
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolija
 CountryMS=Monseratas
 CountryMZ=Mozambikas
-CountryMM=Birma (Mianmaras)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibija
 CountryNR=Nauru
 CountryNP=Nepalas
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidadas ir Tobagas
 CountryTR=Turkija
 CountryTM=Turkmėnistanas
-CountryTC=Terkso ir Cailos salos
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariaris
 CurrencyMUR=Mauricijaus rupijų
 CurrencySingMUR=Mauricijaus rupija
 CurrencyNOK=Norvegijos kronų
-CurrencySingNOK=Norvegijos krona
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuniso dinaras
 CurrencySingTND=Tuniso dinaras
 CurrencyUSD=JAV doleriai
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Žodis
 DemandReasonTypeSRC_PARTNER=Partneris
 DemandReasonTypeSRC_EMPLOYEE=Darbuotojas
 DemandReasonTypeSRC_SPONSORING=Rėmimas
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formatas 4A0
 PaperFormatEU2A0=Formatas 2A0
diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
index eb5690552a6..2e429df760d 100644
--- a/htdocs/langs/lt_LT/ecm.lang
+++ b/htdocs/langs/lt_LT/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Dokumentų skaičius kataloge
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Katalogas
 ECMSectionManual=Rankinis katalogas
 ECMSectionAuto=Automatinis katalogas
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumentai, susiję su projektais
 ECMDocsByUsers=Dokumentai susiję su vartotojais
 ECMDocsByInterventions=Dokumentai, susiję su intervencijomis
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nėra sukurta katalogo
 ShowECMSection=Rodyti katalogą
 DeleteSection=Pašalinti katalogą
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index a7c97b68da0..1f961e9abd2 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/help.lang b/htdocs/langs/lt_LT/help.lang
index 62c5cf2ce72..6f3c98eef25 100644
--- a/htdocs/langs/lt_LT/help.lang
+++ b/htdocs/langs/lt_LT/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Tiesioginis realaus laiko/nuotolinis palaikymas
 OtherSupport=Kita pagalba
 ToSeeListOfAvailableRessources=Susisiekti/pamatyti turimus išteklius:
 HelpCenter=Pagalbos centras
-DolibarrHelpCenter=Dolibarr pagalbos ir palaikymo centras
-ToGoBackToDolibarr=Priešingu atveju, spauskite <a href="%s"> čia norėdami naudoti Dolibarr</a>
-TypeOfSupport=Palaikymo šaltinis
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Bendruomenė (nemokamai)
 TypeSupportCommercial=Komercinis
 TypeOfHelp=Tipas
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efektyvumas
 TypeHelpOnly=Tik pagalba
 TypeHelpDev=Pagalba + vystymas
-TypeHelpDevForm=Pagalba+Vystymas+Formavimas
-ToGetHelpGoOnSparkAngels1=Kai kurios įmonės gali užtikrinti greitą (kartais nedelsiamą) ir efektyvesnį tiesioginį palaikymą, perimant Jūsų kompiuterio kontrolę. Tokius padėjėjus galima rasti <b>%s</b> web svetainėje:
-ToGetHelpGoOnSparkAngels3=Taip pat galite eiti į visų galimų Dolibarr trenerių sąrašą, paspausdami šį mygtuką
-ToGetHelpGoOnSparkAngels2=Kartais nėra galimų įmonių tuo metu pagal Jūsų paiešką, todėl pakeiskite paieškos filtrą į "visų prieinamumą". Galėsite siųsti daugiau užklausų.
-BackToHelpCenter=Priešingu atveju, spauskite čia norėdami grįžti <a href="%s"> atgal į Pagrindinio puslapio Pagalbos centrą</a> .
-LinkToGoldMember=Galite paskambinti vienam iš trenerių, iš anksto atrinktų Dolibarr Jūsų kalbai (%s), spustelėdami jo Widget (būklė ir maksimali kaina yra automatiškai atnaujinami):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Palaikomos kalbos
-SubscribeToFoundation=Padėkite Dolibarr projektui, tapkite nariu
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Oficialiam Dolibarr palaikymui Jūsų kalba: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index 10dabe99509..129d0d90a94 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Žmogiškųjų išteklių valdymas (HRM)
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Mėnesio suvestinė
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Pradžios data
 DateFinCP=Pabaigos data
@@ -15,13 +15,18 @@ ApprovedCP=Patvirtinta
 CancelCP=Atšauktas
 RefuseCP=Atmestas
 ValidatorCP=Tvirtintojas/aprobatorius
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Aprašymas
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Turite pasirinkti pabaigos datą didesnę nei pradžios data.
 ErrorSQLCreateCP=Kuriant įvyko SQL klaida:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Workflow informacija
 RequestByCP=Prašoma
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Redaguoti
 DeleteCP=Ištrinti
 ActionRefuseCP=Atmesti
@@ -59,6 +71,7 @@ DateRefusCP=Atmetimo data
 DateCancelCP=Atšaukimo data
 DefineEventUserCP=Priskirti išimtines atostogas vartotojui
 addEventToUserCP=Priskirti išimtines atostogos
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Priežastis
 UserCP=Vartotojas
 ErrorAddEventToUserCP=Pridedant išimtines atostogas įvyko klaida.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Sėkmingai atnaujinta
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index e3a05631d84..bf3de3245a5 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Tiesiog sekite instrukcijas žingsnis po žingsnio.
 MiscellaneousChecks=Būtinų sąlygų tikrinimas
 ConfFileExists=Konfigūracijos failas <b>%s</b> egzistuoja.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigūracijos failas <b>%s</b> neegzistuoja ir negali būti sukurtas!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfigūracijos failas <b>%s</b> gali būti sukurtas.
-ConfFileIsNotWritable=Konfigūracijos failas <b>%s</b> neįrašomas. Patikrinti leidimus. Diegiant pirmą kartą Jūsų serveris turi būti pajėgus įrašyti į šį failą konfigūracijos proceso metu ("chmod 666", pavyzdžiui Unix tipo OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfigūracijos failas <b>%s</b> įrašomas.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Perkrauti visą informaciją iš konfigūracijos failo.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Šis PHP palaiko sesijas.
 PHPSupportPOSTGETOk=Šis PHP palaiko kintamuosius POST ir GET.
-PHPSupportPOSTGETKo=Galimas dalykas Jūsų PHP nepalaiko kintamųjų POST ir/arba GET. Patikrinti savo parametrą <b>variables_order</b> php.ini.
-PHPSupportGD=Šis PHP palaiko GD grafikos funkcijas.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Šis PHP palaiko UTF8 funkcijos.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b>. To turėtų būti pakankamai.
-PHPMemoryTooLow=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b> baitų. Tai gali būti per mažai. Keisti savo <b>php.ini</b> ir nustatyti <b>memory_limit</b> parametrą mažiausiai į <b>%s</b> baitų.
-Recheck=Spauskite čia norėdami peržiūrėti daugiau reikšmingų bandymų
-ErrorPHPDoesNotSupportSessions=Jūsų įdiegta PHP nepalaiko sesijų. Ši funkcija reikalinga Dolibarr darbui. Patikrinkite savo PHP nustatymus.
-ErrorPHPDoesNotSupportGD=Jūsų įdiegta PHP nepalaiko grafinės GD funkcijos. Grafikai neprieinami.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Jūsų įdiegta PHP nepalaiko UTF8 funkcijos. Dolibarr negali tinkamai veikti. Išspręsti šią problemą prieš diegdami Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Katalogas %s neegzistuoja.
-ErrorGoBackAndCorrectParameters=Eiti atgal ir ištaisyti klaidingus parametrus.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Galbūt įvedėte neteisingą parametro '%s' reikšmę.
 ErrorFailedToCreateDatabase=Nepavyko sukurti duomenų bazės '%s'.
 ErrorFailedToConnectToDatabase=Nepavyko prisijungti prie duomenų bazės '%s'.
 ErrorDatabaseVersionTooLow=Duomenų bazės versija (%s) per sena. Reikalinga versija %s arba naujesnė.
 ErrorPHPVersionTooLow=PHP versija pernelyg sena. Reikalinga versija %s.
-ErrorConnectedButDatabaseNotFound=Prisijungimas prie serverio sėkmingas, bet duomenų bazės '%s' nerasta.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Duomenų bazė '%s' jau egzistuoja.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Jei duomenų bazė neegzistuoja, grįžti ir patikrinti opciją "Sukurti duomenų bazę".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Jei duomenų bazė jau yra, eikite atgal ir nuimkite "Sukurti duomenų bazę" opciją.
-WarningBrowserTooOld=Per sena naršyklės versiją. Rekomenduojama atnaujinti savo naršyklę į naujausią versiją Firefox, Chrome ar Opera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP versija
 License=Naudojant licenciją
 ConfigurationFile=Konfigūracijos failas
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr duomenų bazė
 DatabaseType=Duomenų bazės tipas
 DriverType=Tvarkyklės tipas
 Server=Serveris
-ServerAddressDescription=Duomenų bazės serverio vardas arba IP adresas, paprastai "localhost", kai duomenų bazės serveris yra talpinamas tame pačiame serveryje kaip ir web serveris
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Duomenų bazės serverio prievadas (port). Laikyti tuščią, jei nežinomas.
 DatabaseServer=Duomenų bazės serveris
 DatabaseName=Duomenų bazės pavadinimas
-DatabasePrefix=Duomenų bazės prefiksų lentelė
-AdminLogin=Prisijungimas Dolibarr duomenų bazės savininkui.
-PasswordAgain=Pakartokite slaptažodį antrą kartą
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Slaptažodis Dolibarr duomenų bazės savininkui.
 CreateDatabase=Sukurti duomenų bazę
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Duomenų bazės serveris - Superuser prieiga
-CheckToCreateDatabase=Žymėti langelį, jei duomenų bazės nėra ir ji turi būti sukurta. <br>Tokiu atveju, turite užpildyti prisijungimo/slaptažodį superuser sąskaitai šio puslapio apačioje.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Prisijungimas vartotojui leidžia kurti naujas duomenų bazes arba naujus vartotojus. Tai privaloma, jei Jūsų duomenų bazė ar jos savininkas dar neegzistuoja.
-KeepEmptyIfNoPassword=Palikite tuščią, jei vartotojas neturi slaptažodžio (praleisti)
-SaveConfigurationFile=Išsaugoti reikšmes
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Serverio prisijungimas
 DatabaseCreation=Duomenų bazės sukūrimas
 CreateDatabaseObjects=Duomenų bazės objektų kūrimas
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Sukurti svetimus raktus ir indeksus lentelei %s
 OtherKeysCreation=Svetimų raktų ir indeksų kūrimas
 FunctionsCreation=Funkcijų kūrimas
 AdminAccountCreation=Administratoriaus prisijungimo kūrimas
-PleaseTypePassword=Prašome įvesti slaptažodį, tušti slaptažodžiai negalimi !
-PleaseTypeALogin=Prašome įvesti vartotojo vardą
-PasswordsMismatch=Slaptažodžiai skiriasi, bandykite dar kartą!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Nustatymų pabaiga
 SystemIsInstalled=Diegimas baigtas
 SystemIsUpgraded=Dolibarr buvo sėkmingai atnaujintas
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Reikia sukonfigūruoti Dolibarr, kad atitiktų jūsų
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Eiti į Dolibarr
 GoToSetupArea=Eiti į Dolibarr (Nustatymų sritis)
-MigrationNotFinished=Duomenų bazės versija nėra naujausiai, todėl jums gali tekti iš naujo paleisti versijos atnaujinimo procesą.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Vėl eiti atnaujinti puslapį
 WithNoSlashAtTheEnd=Be simbolio "/" pabaigoje
-DirectoryRecommendation=Rekomenduojama naudoti aplanką išorėje savo web puslapio aplanko.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Jau egzistuoja
 DolibarrAdminLogin=Dolibarr administratoriaus prisijungimas
-AdminLoginAlreadyExists=Dolibarr administratoriaus sąskaita '<b>%s</b>' jau egzistuoja. Grįžkite, jei norite sukurti dar vieną.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Įspėjimas. Dėl saugumo priežasčių, kai įdiegimas ar atnaujinimas baigtas, kad būtų išvengta diegimo iš naujo, turėtumėte pridėti failą pavadinimu <b>install.lock</b> į Dolibarr dokumentų aplanką, siekiant išvengti neteisingo jo naudojimo.
-FunctionNotAvailableInThisPHP=Negalimas su šiuo PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Pasirinkite migracijos skriptą
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skriptas vykdomas
 ChooseYourSetupMode=Pasirinkite nustatymų režimą ir spauskite "Start" ...
 FreshInstall=Naujas diegimas
-FreshInstallDesc=Naudokite šį režimą, jei tai pirmas diegimas. Jei ne, šis režimas gali sutaisyti nepilną praėjusią diegimą, tačiau, jei norite atnaujinti savo versiją, pasirinkite "Upgrade" režimą.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Atnaujinti
 UpgradeDesc=Naudokite šį režimą, jei buvo pakeisti seni Dolibarr failai į naujesnius iš naujesnės versijos. Taip bus atnaujinti duomenų bazė ir duomenys.
 Start=Pradžia
 InstallNotAllowed=Nustatymai neleidžiami pagal <b>conf.php</b> leidimus
 YouMustCreateWithPermission=Jūs turite sukurti failą %s ir nustatyti įrašymo į jį teises  serveriui, diegimo proceso metu.
-CorrectProblemAndReloadPage=Prašome išspręsti šią problemą ir paspauskite F5, kad atnaujinti puslapį.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Jau migravo
 DatabaseVersion=Duomenų bazės versija
 ServerVersion=Duomenų bazės serverio versija
 YouMustCreateItAndAllowServerToWrite=Jūs turite sukurti šį aplanką ir leisti web serveriui į jį rašyti.
 DBSortingCollation=Simbolių rūšiavimo tvarka
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Jūs klausiate sukurti duomenų bazę <b>%s</b>, bet tam Dolibarr reikia prisijungti prie serverio <b>%s</b> su Super User <b>%s</b> teisėmis.
-YouAskLoginCreationSoDolibarrNeedToConnect=Jūs klausiate sukurti duomenų bazės prisijungimą <b>i%s</b>. bet tam, Dolibarr reikia prisijungti prie serverio <b>%s</b> su Super User <b>%s</b> teisėmis.
-BecauseConnectionFailedParametersMayBeWrong=Sujungimas nepavyko, Hostingo ar Super vartotojo parametrai yra neteisingi.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Našlaičių mokėjimai, aptikti metodu %s
 RemoveItManuallyAndPressF5ToContinue=Pašalinti rankiniu būdu ir paspausti F5 tęsti toliau.
 FieldRenamed=Laukas pervadintas
-IfLoginDoesNotExistsCheckCreateUser=Jei prisijungimas dar neegzistuoja, Jūs turite patikrinti opciją "Sukurti vartotoją"
-ErrorConnection=Serveris "<b>%s</b>", duomenų bazės pavadinimas "b>%s</b>", prisijungimas "<b>%s</b>", arba duomenų bazės slaptažodis gali būti klaidingi arba kliento PHP versija gali būti per sena, palyginti su duomenų bazės versija.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Rekomenduojama pasirinkti įdiegimui versiją <b>%s</b> iš Jūsų einamosios versijos <b>%s</b>
 InstallChoiceSuggested=<b>Instaliuoti diegėjo siūlomą pasirinkimą</b>.
-MigrateIsDoneStepByStep=Numatyta versija (%s) turi keletą versijų, todėl diegimo vedlys grįš pasiūlyti kitą perkėlimą, kai šitas bus baigtas.
-CheckThatDatabasenameIsCorrect=Patikrinti, ar duomenų bazės pavadinimas "<b>%s</b>" yra teisingas.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Jei šis pavadinimas yra teisingas ir duomenų bazė dar neegzistuoja, reikia patikrinti opciją "Sukurti duomenų bazę".
 OpenBaseDir=PHP openbasedir parametras
-YouAskToCreateDatabaseSoRootRequired=Jūs pažymėjote langelį "Sukurti duomenų bazę". Tam Jums reikės suteikti super vartotojo prisijungimą/slaptažodį (formos apačioje).
-YouAskToCreateDatabaseUserSoRootRequired=Jūs pažymėjote langelį "Sukurti duomenų bazės savininką". Tam Jums reikės suteikti super vartotojo prisijungimą/slaptažodį (formos apačioje).
-NextStepMightLastALongTime=Šis žingsnis gali trukti kelias minutes. Prašome, prieš tęsiant palaukti, kol pilnai pasirodys kitas ekranas.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Perkelti gabenimą klientų užsakymų saugojimui
 MigrationShippingDelivery=Atnaujinkite gabenimo saugojimą
 MigrationShippingDelivery2=Atnaujinkite gabenimo 2 saugojimą
 MigrationFinished=Perkėlimas baigtas
-LastStepDesc=<strong>Paskutinis žingsnis</strong>: Nustatykite čia prisijungimo vardą ir slaptažodį, kuriuos planuojate naudoti prisijungimui prie programos. Nepameskite jų, nes tai yra administratoriaus, kuris administruoja visus kitus vartotojus, sąskaitos rekvizitai.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Įjungti modulį %s
 ShowEditTechnicalParameters=Spauskite čia, kad galėtumete matyti/redaguoti išplėstinius parametrus (eksperto režime)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Jūsų duomenų bazės versija yra %s. Gali būti kritinė situacija su duomenų praradimu, jeigu pakeisite duomenų bazės struktūrą, kaip reikalaujama perkėlimo proceso metu. Šiuo tikslu perkėlimas nebus leidžiamas, kol nebus atliktas duomenų bazės programos atnaujinimas į aukštesnę versiją (žinomų klaidingų versijų sąrašas: %s)
-KeepDefaultValuesWamp=Jūs naudojate Dolibarr nustatymų vedlį iš DoliWamp, todėl čia siūlomos reikšmės jau yra optimizuotas. Juos keiskite tik, jeigu tikrai žinote, ką darote.
-KeepDefaultValuesDeb=Naudojate Dolibarr vedlį iš Linux paketo (Ubuntu, Debian, Fedora ...), todėl čia siūlomos reikšmės jau yra optimizuotos. Tik duomenų bazės savininko slaptažodis turi būti pilnai sukurtas. Keiskite kitus parametrus tik jei tikrai žinote, ką darote.
-KeepDefaultValuesMamp=Naudojate Dolibarr vedlį iš DoliMamp, todėl čia siūlomos reikšmės jau yra optimizuotos. Keiskite juos tik jei tikrai žinote, ką darote.
-KeepDefaultValuesProxmox=Naudojate Dolibarr vedlį iš Proxmox virtualaus prietaiso, todėl čia siūlomos reikšmės jau yra optimizuotos. keiskite juos tik jei tikrai žinote, ką darote.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Komercinių pasiūlymų duomenų perkėlimas
 MigrationInvoice=Klientų sąskaitų-faktūrų duomenų perkėlimas
 MigrationContract=Sutarčių duomenų perkėlimas
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Atnaujinimas sėkmingas
 MigrationUpdateFailed=Nepavyko atnaujinti proceso
 MigrationRelationshipTables=Ryšių lentelių (%s) duomenų perkėlimas
 MigrationPaymentsUpdate=Mokėjimo duomenų taisymas
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Sutarties duomenų taisymas
 MigrationContractsNumberToUpdate=%s sutarties (-ių) atnaujinimas
 MigrationContractsLineCreation=Sukurti sutarties eilutę sutarčiai su nuoroda %s
 MigrationContractsNothingToUpdate=Nėra daugiau ką daryti
-MigrationContractsFieldDontExist=Laukelis fk_facture neegzistuoja. Nieko nedaryti.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Sutarties tuščių duomenų taisymas
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Nėra sutarties tuščių duomenų taisymui
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nėra sutarties sukūrimo duomenų taisymui
 MigrationContractsInvalidDatesUpdate=Bloga taisoma sutarties datos reikšmė
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Pristatymo atnaujinimas
 MigrationStockDetail=Atnaujinkite produktų atsargų vertę
 MigrationMenusDetail=Atnaujinkite dinamines meniu lenteles
 MigrationDeliveryAddress=Atnaujinti pristatymo adresus gabenimo dokumentuose
-MigrationProjectTaskActors=Duomenų perkėlimas į llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Duomenų perkėlimo laukelis fk_user_resp iš llx_projet į llx_element_contact
 MigrationProjectTaskTime=Atnaujinti praleistą laiką sekundėmis
 MigrationActioncommElement=Atnaujinti veiksmų duomenis
 MigrationPaymentMode=Duomenų perkėlimas mokėjimo būdui
 MigrationCategorieAssociation=Kategorijų perkėlimas
-MigrationEvents=Įvykių migracija pridedant įvykio savininką į užduočių lentelę
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Perkrauti modulį %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Parodyti negalimas opcijas
-HideNotAvailableOptions=Paslėpti negalimas opcijas
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index afef8b4e05c..a1202124794 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Šios trečiosios šalies adresatas
 ContactsAddressesForCompany=Adresatai/adresai šiai trečiajai šaliai
 AddressesForCompany=Adresai šiai trečiajai šaliai
 ActionsOnCompany=Įvykiai su šia trečiają šalimi
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Įvykiai su šiuo nariu
 ActionsOnProduct=Events about this product
 NActionsLate=%s vėluoja
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Išlaidų ataskaita
 ExpenseReports=Išlaidų ataskaitos
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index d4c291a466e..1aecb06a3e0 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Susietas objektas
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Pavadinimas
 WEBSITE_DESCRIPTION=Aprašymas
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/lt_LT/paybox.lang b/htdocs/langs/lt_LT/paybox.lang
index 60315a41620..e1e7a824e39 100644
--- a/htdocs/langs/lt_LT/paybox.lang
+++ b/htdocs/langs/lt_LT/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Paybox modulio nustatymas
 PayBoxDesc=Šis modulis siūlo puslapius, leidžiančius mokėjimą <a href="http://www.paybox.com" target="_blank">Paybox</a> klientams. Tai gali būti naudojama nemokamam mokėjimui arba  tam tikram specifiniam Dolibarr mokėjimui (sąskaitos-faktūros, užskymas, ...)
 FollowingUrlAreAvailableToMakePayments=Sekantys URL siūlo puslapį klientui Dolibarr objektų mokėjimui
 PaymentForm=Mokėjimo forma
-WelcomeOnPaymentPage=Sveiki atvykę į mūsų interneto mokėjimo paslaugą
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Šis ekranas leidžia atlikti internetinį mokėjimą į %s
 ThisIsInformationOnPayment=Tai informacija apie reikalingą atlikti mokėjimą
 ToComplete=Užbaigti
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL siūlo %s interneto mokėjimui vartoto
 ToOfferALinkForOnlinePaymentOnContractLine=URL siūlo %s interneto mokėjimui vartotojo sąsają sutarties eilutei.
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL siūlo %s interneto mokėjimui vartotojo sąsaja nemokamam kiekiui.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pasiūlymui %s interneto mokėjimui vartotojo sąsają nario pasirašymui.
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Taip pat galite pridėti URL parametrą <b>&tag=<i>value</i></b> į bet kurį URL (reikalingas tik nemokamam mokėjimui) pridėti nuosavo mokėjimo komentaro žymę.
-SetupPayBoxToHavePaymentCreatedAutomatically=Nustatyti savo Paybox su URL <b>%s</b>, kad mokėjimas būtų sukuriamas automatiškai, kai patvirtintas per PayBox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Šis puslapis patvirtina, kad jūsų mokėjimas buvo užregistruotas. Ačiū.
-YourPaymentHasNotBeenRecorded=Mokėjimas nebuvo įregistruotas ir operacija buvo atšaukta. Ačiū.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Sąskaitos parametrai
 UsageParameter=Naudojimo parametrai
 InformationToFindParameters=Padėti rasti savo %s sąskaitos informaciją
diff --git a/htdocs/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang
index 25ae28327a9..ff24291e1c1 100644
--- a/htdocs/langs/lt_LT/propal.lang
+++ b/htdocs/langs/lt_LT/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Pasirašyta (reikia pateikti sąskaitą-faktūrą)
 PropalStatusNotSigned=Nepasirašyta (uždarytas)
 PropalStatusBilled=Sąskaita-faktūra pateikta
 PropalStatusDraftShort=Projektas
-PropalStatusValidatedShort=Galiojantis
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Uždarytas
 PropalStatusSignedShort=Pasirašyta
 PropalStatusNotSignedShort=Nepasirašyta
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Pasiūlymas %s nerastas
 AddToDraftProposals=Pridėti į pasiūlymo projektą
 NoDraftProposals=Nėra pasiūlymų projekto
 CopyPropalFrom=Sukurti komercinį pasiūlymą kopijuojant esamą pasiūlymą
-CreateEmptyPropal=Sukurti tuščią naują komercinį pasiūlymą arba iš produktų/paslaugų sąrašo
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Komercinio pasiūlymo galiojimo trukmė (dienomis) pagal nutylėjimą
-UseCustomerContactAsPropalRecipientIfExist=Naudokite kliento kontaktinį adresą, jei aprašytas, vietoje trečiosios šalies adreso, kaip pasiūlymo gavėjo.
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klonuoti komercinį pasiūlymą
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kliento kontaktas tęstiniame pasiūlyme
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Išsamus užsakymo modelis (logo. ..)
+DocModelCyanDescription=Išsamus užsakymo modelis (logo. ..)
 DefaultModelPropalCreate=Modelio sukūrimas pagal nutylėjimą
 DefaultModelPropalToBill=Šablonas pagal nutylėjimą, kai uždaromas verslo pasiūlymas (turi būti išrašyta sąskaita-faktūra)
 DefaultModelPropalClosed=Šablonas pagal nutylėjimą, kai uždaromas verslo pasiūlymas (sąskaita-faktūra neišrašoma)
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 4c9347c884c..fde6d993ef0 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kodas
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Skaityti
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 4e68130e2d4..f4745ab2fa7 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -32,7 +32,7 @@ PurgeSessions=Iztīrīt sesijas
 ConfirmPurgeSessions=Vai jūs tiešām vēlaties iztīrītu visas sesijas? Tas atvienos katru lietotāju (izņemot sevi).
 NoSessionListWithThisHandler=Saglabāt sesijas apstrādātāju, kas konfigurēts jūsu PHP, neļauj uzskaitīt visas darbojas sesijas.
 LockNewSessions=Bloķēt jaunas sesijas
-ConfirmLockNewSessions=Vai tiešām vēlaties ierobežot jebkuru jaunu Dolibarr savienojumu ar sevi? Pēc tam varēs izveidot savienojumu tikai lietotājs <b> %s </b>.
+ConfirmLockNewSessions=Vai tiešām vēlaties ierobežot jebkuru jaunu Dolibarr savienojumu? Pēc tam varēs izveidot savienojumu tikai lietotājs <b> %s </b>.
 UnlockNewSessions=Noņemt savienojuma bloķēšanu
 YourSession=Jūsu sesija
 Sessions=Lietotāju sesijas
@@ -60,7 +60,7 @@ SecuritySetup=Drošības iestatījumi
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Kļūda, šim modulim ir nepieciešama PHP versija %s vai augstāka
 ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr versija %s vai augstāka
-ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> netiek atbalstīta.
+ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> tiek atbalstīta.
 DictionarySetup=Vārdnīcas iestatījumi
 Dictionary=Vārdnīcas
 ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Iespēja bloķēta demo versijā
 FeatureAvailableOnlyOnStable=Funkcija ir pieejama tikai oficiālajā stabilā versijā
 BoxesDesc=Logrīki ir sastāvdaļas, kas parāda informāciju, kuru varat pievienot, lai personalizētu dažas lapas. Varat izvēlēties starp widget parādīšanu, izvēloties mērķa lapu un noklikšķinot uz Aktivizēt, vai noklikšķinot uz atkritnes, lai to atspējotu.
 OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a> tiek parādīts.
-ModulesDesc=Moduļi / lietojumprogrammas nosaka, kādas funkcijas ir pieejamas programmatūrā. Daži moduļi pieprasa atļauju lietotājiem pēc moduļa aktivizēšanas. Noklikšķiniet uz ieslēgšanas / izslēgšanas pogas, lai iespējotu / atspējotu moduli / programmu.
+ModulesDesc=Moduļi / lietojumprogrammas nosaka, kādas funkcijas ir pieejamas programmatūrā. Daži moduļi pieprasa atļauju lietotājiem pēc moduļa aktivizēšanas. Noklikšķiniet uz ieslēgšanas / izslēgšanas pogas (moduļa beigās), lai iespējotu / atspējotu moduli / programmu.
 ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļu, lai lejupielādētu ārējās tīmekļa vietnēs internetā ...
 ModulesDeployDesc=Ja atļaujas jūsu failu sistēmā to atļauj, varat izmantot šo rīku, lai izvietotu ārēju moduli. Tad modulis būs redzams cilnē <strong> %s </ strong>.
 ModulesMarketPlaces=Atrastt ārējo lietotni / moduļus
@@ -239,7 +239,7 @@ OfficialWebSiteLocal=Lokālā mājas lapa (%s)
 OfficialWiki=Dolibarr Wiki dokumentācija
 OfficialDemo=Dolibarr tiešsaistes demo
 OfficialMarketPlace=Oficiālais tirgus vieta ārējiem moduļiem/papildinājumiem
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=Saistītie tīmekļa vietnes pakalpojumi (Cloud hosting)
 ReferencedPreferredPartners=Ieteicamie partneri
 OtherResources=Citi resursi
 ExternalResources=Ārējie resursi
@@ -265,9 +265,9 @@ EMailsSetup=E-pastu iestatīšana
 EMailsDesc=Šī lapa ļauj jums ignorēt jūsu noklusējuma PHP parametrus e-pasta sūtīšanai. Vairumā gadījumu uz Unix / Linux OS, PHP iestatīšana ir pareiza, un šie parametri nav vajadzīgi.
 EmailSenderProfiles=E-pasta sūtītāju profili
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS ports (noklusējuma vērtība php.ini: <b> %s </b>)
-MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (noklusējuma vērtība php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Resursa (noklusējuma vērtība php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS ports (nav definēts PHP uz Unix līdzīgām sistēmām)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS resursdators (nav definēts PHP uz Unix līdzīgām sistēmām)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS resurs (nav definēts PHP Unix līdzīgās sistēmās)
 MAIN_MAIL_EMAIL_FROM=Sūtītāja e-pasta ziņojums automātiskajiem e-pasta ziņojumiem (noklusējuma vērtība php.ini: <b> %s </b>)
 MAIN_MAIL_ERRORS_TO=E-pasts, ko izmanto, lai kļūtu, atgriež e-pastus (laukos 'Kļūdas-To' e-pasta ziņojumos)
 MAIN_MAIL_AUTOCOPY_TO= Kopija (Bcc) visi nosūtītie e-pasta ziņojumi uz
@@ -276,14 +276,14 @@ MAIN_MAIL_FORCE_SENDTO=Nosūtiet visus e-pastus (nevis reāliem saņēmējiem, l
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Pievienojiet darbinieka lietotājus ar e-pasta adresi atļauto adresātu sarakstā
 MAIN_MAIL_SENDMODE=E-pasta sūtīšanas veids
 MAIN_MAIL_SMTPS_ID=SMTP ID (ja servera nosūtīšanai nepieciešama autentifikācija)
-MAIN_MAIL_SMTPS_PW=SMTP parole (ja servera nosūtīšanai nepieciešama autentificēšana)
+MAIN_MAIL_SMTPS_PW=SMTP parole (ja servera sūtīšanai nepieciešama autentificēšanās)
 MAIN_MAIL_EMAIL_TLS=Izmantot TLS (SSL) šifrēšanu
 MAIN_MAIL_EMAIL_STARTTLS=Izmantojiet TLS (STARTTLS) šifrēšanu
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Izmantojiet DKIM, lai ģenerētu e-pasta parakstu
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-pasta domēns lietošanai ar DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=DKIM selektora nosaukums
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privāta atslēga DKIM parakstīšanai
-MAIN_DISABLE_ALL_SMS=Atspējot visas īsziņu sūtīšanas (testa nolūkos vai demos)
+MAIN_DISABLE_ALL_SMS=Atspējot visas īsziņu sūtīšanas (testa nolūkos vai demo)
 MAIN_SMS_SENDMODE=Izmantojamā metode SMS sūtīšanai
 MAIN_MAIL_SMS_FROM=Noklusētais sūtītāja tālruņa numurs SMS nosūtīšanai
 MAIN_MAIL_DEFAULT_FROMTYPE=Noklusējuma sūtītāja e-pasta ziņojums manuālai sūtīšanai (lietotāja e-pasts vai uzņēmuma e-pasts)
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-moduļu rīki
 ModuleFamilyExperimental=Eksperimentālie moduļi
 ModuleFamilyFinancial=Finanšu Moduļi (Grāmatvedība/kase)
 ModuleFamilyECM=Elektroniskais Satura Vadība (ESV)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Izvēlnes manipulatori
 MenuAdmin=Izvēlnes redaktors
@@ -463,9 +463,9 @@ ClickToShowDescription=Noklikšķiniet, lai parādītu aprakstu
 DependsOn=Šim modulim nepieciešams modulis (-i)
 RequiredBy=Šis modulis nepieciešams modulim (-ļiem)
 TheKeyIsTheNameOfHtmlField=Šis ir HTML lauka nosaukums. Lai izlasītu HTML lapas saturu, ir nepieciešamas tehniskās zināšanas, lai iegūtu lauka atslēgas nosaukumu.
-PageUrlForDefaultValues=Jums jāievada relatīvā lapas URL. Ja URL tiek iekļauti parametri, noklusējuma vērtības būs efektīvas, ja visi parametri ir vienādi. Piemēri:
-PageUrlForDefaultValuesCreate=<br> Veidā, lai izveidotu jaunu trešo personu, tas ir <strong> %s </ strong> <br> <br> Ja vēlaties tikai noklusējuma vērtību, ja url ir kāds parametrs, varat izmantot <strong> %s </ strong>
-PageUrlForDefaultValuesList=<br> Lapai, kas ir trešo pušu saraksts, tā ir <strong> %s </strong> <br>  Ja vēlaties tikai noklusējuma vērtību, ja url ir kāds parametrs, varat izmantot <strong> %s </strong>
+PageUrlForDefaultValues=Jums jāievada relatīvais lapas ceļš URL. Ja URL tiek iekļauti parametri, noklusējuma vērtības būs efektīvas, ja visi parametri ir vienādi.
+PageUrlForDefaultValuesCreate=<br> Piemērs: <br> Jaunas trešās puses veidlapas izveidei ir <strong> %s </ strong> <br> <br> Par ārējo moduļu URL, kas ir instalēti pielāgotajā direktorijā, neiekļauj "custom /" tāpēc izmantojiet kā <strong> mymodule / mypage.php </ strong>, nevis custom / mymodule / mypage.php. <br> Ja vēlaties noklusējuma vērtību tikai tad, ja url ir kāds parametrs, varat izmantot <strong> %s </ spēcīgs>
+PageUrlForDefaultValuesList=<br> Piemērs: <br> Lapai, kas ir trešo pušu saraksts, tā ir <strong> %s </ strong> <br> <br> Par ārējo moduļu URL, kas ir instalēti pielāgotajā direktorijā, neietver "custom /" izmantojiet tādu kā <strong> mymodule / mypagelist.php </ strong>, nevis custom / mymodule / mypagelist.php. <br> Ja vēlaties noklusējuma vērtību tikai tad, ja url ir kāds parametrs, varat izmantot <strong> %s </ strong >
 EnableDefaultValues=Iespējot personalizēto noklusēto vērtību izmantošanu
 EnableOverwriteTranslation=Iespējot pārrakstīto tulkojumu izmantošanu
 GoIntoTranslationMenuToChangeThis=Taustiņam ir atrasts tulkojums ar šo kodu. Lai mainītu šo vērtību, jums ir jārediģē no Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=Saknes direktorija, kurā visi faili tiek manuāli aug
 Module0Name=Lietotāji un grupas
 Module0Desc=Lietotāju / Darbinieku un Grupu vadība
 Module1Name=Trešās puses
-Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Tirdzniecība
 Module2Desc=Komerciālā pārvaldība
 Module10Name=Grāmatvedība
@@ -501,7 +501,7 @@ Module23Desc=Uzraudzība patēriņu enerģijas
 Module25Name=Klientu Pasūtījumi
 Module25Desc=Klientu pasūtījumu pārvaldīšana
 Module30Name=Rēķini
-Module30Desc=Rēķinu un kredītu piezīmi vadību klientiem. Rēķinu pārvaldības piegādātājiem
+Module30Desc=Rēķinu un kredītkartes pārvaldīšana klientiem. Rēķinu un kredītrisku pārvaldīšana piegādātājiem
 Module40Name=Piegādātāji
 Module40Desc=Piegādātāju un pirkumu vadība (pirkšanas pasūtījumi un norēķini)
 Module42Name=Atkļūdošanas žurnāli
@@ -902,7 +902,7 @@ DictionaryVAT=PVN likmes vai pārdošanas procentu likmes
 DictionaryRevenueStamp=Nodokļu zīmogu daudzums
 DictionaryPaymentConditions=Apmaksas noteikumi
 DictionaryPaymentModes=Maksājumu veidi
-DictionaryTypeContact=Kontaktpersonas adreses veidi
+DictionaryTypeContact=Kontakti/adrešu veidi
 DictionaryTypeOfContainer=Vietnes lapu / konteineru veids
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Papīra formāts
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atrast kodu
 LabelOnDocuments=Dokumentu marķējums
 LabelOrTranslationKey=Uzlīme vai tulkošanas taustiņš
+ValueOfConstantKey=Konstanta vērtība
 NbOfDays=Dienu skaits
 AtEndOfMonth=mēneša beigās
 CurrentNext=Pašreizējais / nākamais
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s"> %s -> %s </a> <br> Galvenie parametri, kurus izm
 SetupDescription4=<a href="%s"> %s -> %s </a> <br> Dolibarr ERP / CRM ir vairāku moduļu / lietojumprogrammu kolekcija, kas ir vairāk vai mazāk neatkarīgas. Jūsu vajadzībām atbilstošie moduļi ir jāaktivizē un jākonfigurē. Jaunas preces / iespējas tiek pievienotas izvēlnēm, aktivizējot moduli.
 SetupDescription5=Citu iestatījumu izvēlnes ieraksti nodrošina papildu parametrus.
 LogEvents=Drošības audita notikumi
-Audit=Audits
+Audit=Drošības notikumi
 InfoDolibarr=Par Dolibarr
 InfoBrowser=Pārlūkprogrammas info
 InfoOS=Par OS
@@ -1065,7 +1066,7 @@ BrowserName=Pārlūkprogrammas nosaukums
 BrowserOS=Pārlūkprogrammas OS
 ListOfSecurityEvents=Saraksts ar Dolibarr drošības pasākumiem
 SecurityEventsPurged=Drošības pasākumi dzēsti
-LogEventDesc=Jūs varat ļaut šeit reģistrēšanu Dolibarr drošības notikumiem. Administratori tad var redzēt tās saturu, izmantojot izvēlnes <b>Sistēmas rīki - revīzijas.</b> Uzmanību, šī funkcija var patērēt lielu daudzumu datu bāzē.
+LogEventDesc=Šeit varat iespējot drošības notikumu reģistrēšanu. Administratori pēc tam var redzēt tā saturu, izmantojot izvēlni <b> %s - %s </b>. Brīdinājums, šī funkcija var patērēt lielu datu apjomu datu bāzē.
 AreaForAdminOnly=Iestatīšanas parametrus var iestatīt tikai <b> administratora lietotāji </b>.
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī joma ir pieejama administratora lietotājiem. Neviens no Dolibarr atļauju var samazināt šo robežu.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Neto vienības produkta cena
 TotalPriceAfterRounding=Kopējā cena (neto/pvn/ar nodokli) pēc noapaļošanas
 ParameterActiveForNextInputOnly=Parametrs stājas spēkā no nākamās ievades
-NoEventOrNoAuditSetup=Nav drošības pasākumi ierakstīti vēl. Tas var būt normāli, ja audits nav iespējots "Iestatījumi - drošība - audtits" lapā.
+NoEventOrNoAuditSetup=Vēl neviens drošības notikums nav reģistrēts. Tas var būt normāli, ja lapā "Iestatīšana - Drošība - notikumi" nav veikta revīzija.
 NoEventFoundWithCriteria=Šim meklēšanas kritērijam nav atrasts neviens drošības notikums.
 SeeLocalSendMailSetup=Skatiet sendmail iestatījumus
 BackupDesc=Lai izveidotu pilnu Dolibarr rezerves kopiju jums ir:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Papildu atribūti (veidņu rēķinu līnijas)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Papildinošas atribūti (thirdparty)
-ExtraFieldsContacts=Papildu atribūti (kontaktadrese)
+ExtraFieldsContacts=Papildu atribūti (kontakti / adrese)
 ExtraFieldsMember=Papildinošas atribūti (biedrs)
 ExtraFieldsMemberType=Papildinošas atribūti (biedrs tipa)
 ExtraFieldsCustomerInvoices=Papildinošas atribūti (rēķini)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Paziņojumu saraksts katram lietotājam *
 ListOfNotificationsPerUserOrContact=Paziņojumu saraksts katram lietotājam * vai katram kontaktam **
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Atveriet lietotāja cilni "Paziņojumi", lai pievienotu vai noņemtu paziņojumus lietotājiem
-GoOntoContactCardToAddMore=Atveriet trešās personas cilni "Paziņojumi", lai pievienotu vai noņemtu paziņojumus par kontaktpersonu adresēm
+GoOntoContactCardToAddMore=Atveriet trešās personas cilni "Paziņojumi", lai pievienotu vai noņemtu paziņojumus par kontaktpersonām / adresēm
 Threshold=Slieksnis
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=E-pasts apkopo apstiprinājumu
 EmailCollectorConfirmCollect=Vai jūs vēlaties palaist kolekcijas kolekcionāru tagad?
 NoNewEmailToProcess=Nav apstrādāts jauns e-pasts (atbilstošie filtri)
 NothingProcessed=Nekas nav paveikts
-XEmailsDoneYActionsDone=%s analizētie e-pasta ziņojumi, %s e-pasta ziņojumi, kas veiksmīgi apstrādāti (par %s ierakstu / veiktajām darbībām) kolekcionārs
-RecordEvent=Ierakstīt notikumu
+XEmailsDoneYActionsDone=%s e-pastu kvalificēts, %s e-pasts veiksmīgi apstrādāts (par %s ierakstu / veiktas darbības) kolekcionārs
+RecordEvent=Ierakstiet e-pasta notikumu
 CreateLeadAndThirdParty=Izveidojiet svinu (un, ja nepieciešams, trešo pusi)
 CodeLastResult=Pēdējā vākšanas rezultāta kods
 NbOfEmailsInInbox=E-pasta numurs avota direktorijā
+LoadThirdPartyFromName=Ielādēt trešās puses nosaukumu (tikai ielāde)
+LoadThirdPartyFromNameOrCreate=Ielādējiet trešās puses nosaukumu (izveidojiet, ja tas nav atrasts).
+WithDolTrackingID=Atrasts Dolibarr izsekošanas ID
+WithoutDolTrackingID=Dolibarr izsekošanas ID nav atrasts
+FormatZip=Pasta indekss
 ##### Resource ####
 ResourceSetup=Konfigurācijas moduļa resurss
 UseSearchToSelectResource=Izmantojiet meklēšanas formu, lai izvēlētos resursu (nevis nolaižamo sarakstu).
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 060daf141f6..8f4b7f15ad4 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -164,3 +164,5 @@ AddVariousPayment=Pievienot dažādus maksājumus
 SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index ed92ad9f0db..c7998ddf58e 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -465,7 +465,7 @@ Cheques=Pārbaudes
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=Šī %s ir pārveidota par %s
-UsBillingContactAsIncoiveRecipientIfExist=Izmantot klientu norēķinu kontaktadresi, nevis trešo personu adresi, kā adresāta rēķiniem
+UsBillingContactAsIncoiveRecipientIfExist=Izmantojiet kontaktu / adresi ar tipa "norēķinu kontaktu", nevis trešās puses adresi kā rēķinu saņēmēju
 ShowUnpaidAll=Rādīt visus neapmaksātos rēķinus
 ShowUnpaidLateOnly=Rādīt vēlu neapmaksātiem rēķiniem tikai
 PaymentInvoiceRef=Maksājuma rēķins %s
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index d4566dc3784..e153eb4610e 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -33,11 +33,12 @@ FilterRefOrLabelOrBC=Meklēšana (Ref/Nosaukums)
 UserNeedPermissionToEditStockToUsePos=Jūs lūdzat samazināt krājumus rēķina izveidē, tāpēc lietotājam, kurš izmanto POS, ir jābūt atļaujai rediģēt krājumus.
 DolibarrReceiptPrinter=Dolibarr čeku printeris
 PointOfSale=Tirdzniecības punkts
+PointOfSaleShort=POS
 CloseBill=Aizvērt rēķinu
 Floors=Stāvi
 Floor=Stāvs
 AddTable=Pievienot tabulu
 Place=Vieta
-TakeposConnectorNecesary=Nepieciešams lietot "TakePOS Connector"
+TakeposConnectorNecesary='TakePOS Connector' required
 OrderPrinters=Pasūtīt printerus
 SearchProduct=Meklēt produktu
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index a2c44e89d28..46b2def6972 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Tālruņa zvans
 ActionAC_FAX=Nosūtīt pa faksu
 ActionAC_PROP=Nosūtīt priekšlikumu pa pastu
 ActionAC_EMAIL=Sūtīt pa e-pastu
+ActionAC_EMAIL_IN=E-pasta saņemšana
 ActionAC_RDV=Sanāksmes
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Nosūti klienta rēķinu pa pastu
diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang
index b48eed3b4b3..1a045f00f62 100644
--- a/htdocs/langs/lv_LV/dict.lang
+++ b/htdocs/langs/lv_LV/dict.lang
@@ -6,7 +6,7 @@ CountryES=Spānija
 CountryDE=Vācija
 CountryCH=Šveice
 # Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
-CountryGB=Lielbritānija
+CountryGB=Apvienotā Karaliste
 CountryUK=Lielbritānija
 CountryIE=Īrija
 CountryCN=Ķīna
@@ -116,7 +116,7 @@ CountryHM=Hērda un Makdonalda salas
 CountryVA=Svētais Krēsls (Vatikāna Pilsētvalsts)
 CountryHN=Hondurasa
 CountryHK=Honkonga
-CountryIS=Islande
+CountryIS=Īslande
 CountryIN=Indija
 CountryID=Indonēzija
 CountryIR=Irāna
@@ -158,9 +158,9 @@ CountryMX=Meksika
 CountryFM=Mikronēzija
 CountryMD=Moldova
 CountryMN=Mongolija
-CountryMS=Monserrat
+CountryMS=Monserrata
 CountryMZ=Mozambika
-CountryMM=Birmania (Mjanma)
+CountryMM=Mjanma (Birmija)
 CountryNA=Namībija
 CountryNR=Nauru
 CountryNP=Nepāla
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidāda un Tobāgo
 CountryTR=Turcija
 CountryTM=Turkmenistāna
-CountryTC=Tērksas un Cailos salas
+CountryTC=Turks un Kaikosas salas
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -251,7 +251,7 @@ CountryMF=Saint Martin
 ##### Civilities #####
 CivilityMME=Kundze
 CivilityMR=Kungs
-CivilityMLE=Ms
+CivilityMLE=Jaunkundze.
 CivilityMTRE=Meistars
 CivilityDR=Doktors
 ##### Currencies #####
@@ -274,10 +274,10 @@ CurrencyMAD=Dirhams
 CurrencySingMAD=Dirhams
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
-CurrencyMUR=Maurīcija rūpijas
-CurrencySingMUR=Maurīcija rūpija
+CurrencyMUR=Maurīcijas rūpijas
+CurrencySingMUR=Maurīcijas rūpija
 CurrencyNOK=Norvēģijas kronas
-CurrencySingNOK=Norvēģijas krona
+CurrencySingNOK=Norvēģijas kronas
 CurrencyTND=Tunisijas dināri
 CurrencySingTND=Tunisijas dinārs
 CurrencyUSD=ASV dolāri
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=No mutes mutē
 DemandReasonTypeSRC_PARTNER=Partneris
 DemandReasonTypeSRC_EMPLOYEE=Darbinieks
 DemandReasonTypeSRC_SPONSORING=Sponsorēšana
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formāts 4A0
 PaperFormatEU2A0=Formāts 2A0
@@ -328,8 +329,8 @@ PaperFormatCAP5=Formāts P5 Kanāda
 PaperFormatCAP6=Formāts P6 Kanāda
 #### Expense report categories ####
 ExpAutoCat=Automašīna
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpCycloCat=Mopēds
+ExpMotoCat=Motocikls
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -340,18 +341,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV un vairāk
+ExpAuto4PCV=4 CV un vairāk
+ExpAuto5PCV=5 CV un vairāk
+ExpAuto6PCV=6 CV un vairāk
+ExpAuto7PCV=7 CV un vairāk
+ExpAuto8PCV=8 CV un vairāk
+ExpAuto9PCV=9 CV un vairāk
+ExpAuto10PCV=10 CV un vairāk
+ExpAuto11PCV=11 CV un vairāk
+ExpAuto12PCV=12 CV un vairāk
+ExpAuto13PCV=13 CV un vairāk
+ExpCyclo=Jauda mazāka par 50cm3
+ExpMoto12CV=Motociklu 1 vai 2 CV
+ExpMoto345CV=3, 4 vai 5 CV motocikls
+ExpMoto5PCV=Motocikls 5 CV un vairāk
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 6b2738a77de..12168b0f773 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenti, kas saistīti ar projektiem
 ECMDocsByUsers=Ar lietotājiem saistītie dokumenti
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Ar izdevumu ziņojumiem saistītie dokumenti
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nav izveidots katalogs
 ShowECMSection=Rādīt katalogu
 DeleteSection=Dzēst direktoriju
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index c7552c4c0db..495345c9808 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=Jūs iestatāt paredzēto summu šim svinam / svinam. Tāpēc jums ir jāievada arī tā statuss
+ErrorOppStatusRequiredIfAmount=Jūs iestatāt aplēsto summu šim svinam. Tāpēc jums ir jāievada arī tā statuss
 ErrorFailedToLoadModuleDescriptorForXXX=Neizdevās ielādēt moduļa deskriptoru klasi %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=Saglabājot izmaiņas, radās kļūda
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=Produkta svītrkoda %s jau pastāv citā produk
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Ņemiet vērā arī, ka virtuālā produkta izmantošana, lai automātiski palielinātu vai samazinātu subproduktus, nav iespējama, ja vismaz vienam produktam (vai blakusproduktam) ir nepieciešams sērijas / partijas numurs.
 ErrorDescRequiredForFreeProductLines=Apraksts ir obligāts līnijām ar bezmaksas produktu
 ErrorAPageWithThisNameOrAliasAlreadyExists=Lapā / konteinerā <strong> %s </strong>ir tāds pats nosaukums vai alternatīvs aizstājvārds, kuru izmantojat
-
+ErrorDuringChartLoad=Ielādējot konta diagrammu, radās kļūda. Ja daži konti nav ielādēti, jūs varat tos ievadīt manuāli.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
diff --git a/htdocs/langs/lv_LV/help.lang b/htdocs/langs/lv_LV/help.lang
index 20741bcd99e..573f4ba659d 100644
--- a/htdocs/langs/lv_LV/help.lang
+++ b/htdocs/langs/lv_LV/help.lang
@@ -16,9 +16,6 @@ Efficiency=Efektivitāte
 TypeHelpOnly=Tikai palīdzība
 TypeHelpDev=Palīdzība + uzlabošana
 TypeHelpDevForm=Palīdzība + attīstība + apmācība
-ToGetHelpGoOnSparkAngels1=Daži uzņēmumi var nodrošināt ātru (dažreiz tūlītēju) un efektīvāku tiešsaistes atbalstu, izmantojot tālvadības pulti ar datoru. Šāda palīdzība ir atrodama <b> %s </b> tīmekļa vietnē:
-ToGetHelpGoOnSparkAngels3=Jūs varat arī doties uz visu pieejamo Dolibarr trenažieru sarakstu, lai noklikšķinātu uz pogas
-ToGetHelpGoOnSparkAngels2=Dažreiz, veicot meklēšanu, uzņēmums nav pieejams, tāpēc mainiet filtru, lai meklētu "visu pieejamību". Jūs varēsiet nosūtīt vairāk pieprasījumu.
 BackToHelpCenter=Pretējā gadījumā <a href="%s"> atveriet palīdzības centra sākumlapu </a>.
 LinkToGoldMember=Jūs varat piezvanīt uz vienu no Dolibarr izvēlētām instruktoru valodām (%s), noklikšķinot uz tās logrīka (statuss un maksimālā cena tiek automātiski atjaunināta):
 PossibleLanguages=Atbalstītās valodas
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index d04757371c2..9d3967a9f61 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -112,7 +112,7 @@ NoticePeriod=Paziņojuma periods
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Zemāk ir atvaļinājuma pieprasījums kuru jāapstiprina
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=Lietotājam, kurš ir iesniedzis šo atvaļinājuma pieprasījumu, ir pietiekami daudz pieejamo dienu.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Apstiprinātie atvaļinājumu pieprasījumi
 HolidaysValidatedBody=Jūsu atvaļinājuma pieprasījums no %s līdz %s ir ticis apstiprināts.
 HolidaysRefused=Pieprasījums noraidīts
@@ -123,7 +123,7 @@ FollowedByACounter=1: Šāda veida atvaļinājumam jāievēro skaitītājs. Skai
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
 GoIntoDictionaryHolidayTypes=Iet uz <strong> Sākums - Iestatīšana - Vārdnīcas - Atvaļinājuma veids </ strong>, lai iestatītu dažādu veidu lapas.
 HolidaySetup=Moduļa brīvdienas uzstādīšana
-HolidaysNumberingModules=Atstājiet pieprasījumu numerācijas modeļus
+HolidaysNumberingModules=Atvaļinājuma pieprasījumu numerācijas modeļi
 TemplatePDFHolidays=Veidne atvaļinājumu pieprasīšanai PDF
 FreeLegalTextOnHolidays=Brīvs teksts PDF
-WatermarkOnDraftHolidayCards=Ūdenszīmes uz izbraukšanas pieprasījumiem
+WatermarkOnDraftHolidayCards=Ūdenszīmes uz atvaļinājuma pieprasījumiem
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index b96eb26e8ee..e2e7307f7e9 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -200,6 +200,7 @@ MigrationRemiseEntity=Atjauniniet llx_societe_remise objekta lauka vērtību
 MigrationRemiseExceptEntity=Atjauniniet llx_societe_remise_except objekta lauka vērtību
 MigrationUserRightsEntity=Atjauniniet llx_user_rights objekta lauka vērtību
 MigrationUserGroupRightsEntity=Atjauniniet llx_usergroup_rights objekta lauka vērtību
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Atjaunot moduli BlockedLog par v7 algoritmu
 ShowNotAvailableOptions=Parādīt nepieejamās iespējas
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 73a7604e18c..9aee459cc9b 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Šīs trešās personas kontakti
 ContactsAddressesForCompany=Kontakti / adreses par šīs trešās personas
 AddressesForCompany=Šīs trešās puses adreses
 ActionsOnCompany=Pasākumi par šīs trešās personas
+ActionsOnContact=Šī kontakta/adreses notikumi
 ActionsOnMember=Pasākumi par šo locekli
 ActionsOnProduct=Notikumi ar šo produktu
 NActionsLate=%s vēlu
@@ -836,7 +837,7 @@ Calendar=Kalendārs
 GroupBy=Kārtot pēc...
 ViewFlatList=Skatīt plakanu sarakstu
 RemoveString=Noņemt virkni '%s'
-SomeTranslationAreUncomplete=Dažas piedāvātās valodas var būt tikai daļēji tulkotas vai var saturēt kļūdas. Lūdzu, palīdziet labot savu valodu, reģistrējoties <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ < / a>, lai pievienotu savus uzlabojumus.
+SomeTranslationAreUncomplete=Dažas piedāvātās valodas var būt tikai daļēji tulkotas vai var saturēt kļūdas. Lūdzu, palīdziet labot savu valodu, reģistrējoties <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, lai pievienotu savus uzlabojumus.
 DirectDownloadLink=Tiešā lejupielādes saite (publiska / ārēja)
 DirectDownloadInternalLink=Tiešā lejupielādes saite (ir jāreģistrē un tai ir nepieciešamas atļaujas).
 Download=Lejupielādēt
@@ -847,9 +848,9 @@ ModuleBuilder=Moduļu veidotājs
 SetMultiCurrencyCode=Iestatīt valūtu
 BulkActions=Lielapjoma darbības
 ClickToShowHelp=Noklikšķiniet, lai parādītu rīka padomju palīdzību
-WebSite=Mājas lapa
-WebSites=Tīmekļa vietnes
-WebSiteAccounts=Vietnes konti
+WebSite=Website
+WebSites=Mājas lapas
+WebSiteAccounts=Website accounts
 ExpenseReport=Izdevumu pārskats
 ExpenseReports=Izdevumu atskaites
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Projekta masveida dzēšanas apstiprinājums
 FileSharedViaALink=Fails koplietots, izmantojot saiti
 SelectAThirdPartyFirst=Vispirms izvēlieties trešo pusi ...
 YouAreCurrentlyInSandboxMode=Pašlaik esat %s "smilšu kastes" režīmā
+Inventory=Inventārs
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 936a94c5805..9a735b24f8c 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Saistītais objekts
 NbOfActiveNotifications=Paziņojumu skaits (saņēmēju e-pasta ziņojumu skaits)
 PredefinedMailTest=__(Labdien)__\nŠis ir testa pasts, kas nosūtīts uz __EMAIL__.\nAbas līnijas ir atdalītas.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Labdien)__\nŠis ir <b> testa </b>pasts (vārds testa ir jābūt treknrakstā). <br> Divas rindas atdala ar rāmi. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Labdien,)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Labdien)__\n\nLūdzu, pievienojiet rēķinu __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Labdien)__\n\nMēs vēlamies jūs brīdināt, ka rēķins __REF__, šķiet, nav samaksāts. Rēķins ir pievienots kā atgādinājums.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Labdien)__\n\nLūdzu, pievienojiet komerciālu priekšlikumu __REF__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Moduļa vietnes iestatīšana
 WEBSITE_PAGEURL=Lapas URL
 WEBSITE_TITLE=Virsraksts
 WEBSITE_DESCRIPTION=Apraksts
+WEBSITE_IMAGE=Attēls
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Atslēgas vārdi
 LinesToImport=Importējamās līnijas
diff --git a/htdocs/langs/lv_LV/paybox.lang b/htdocs/langs/lv_LV/paybox.lang
index 12f6f119f1e..7ef6863cbc0 100644
--- a/htdocs/langs/lv_LV/paybox.lang
+++ b/htdocs/langs/lv_LV/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=Lai pabeigtu
 YourEMail=Nosūtīt saņemt maksājuma apstiprinājumu
 Creditor=Kreditors
 PaymentCode=Maksājuma kods
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Maksāt ar kredītkarti vai debetkarti (Paybox)
 ToPay=Apmaksāt
 YouWillBeRedirectedOnPayBox=Jums tiks novirzīts uz drošu Paybox lapā, lai ievadi kredītkartes informāciju
 Continue=Nākamais
@@ -20,8 +20,9 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL piedāvāt %s tiešsaistes maksājumu
 ToOfferALinkForOnlinePaymentOnContractLine=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu līguma līnijas
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL piedāvāt %s tiešsaistes maksājumu lietotāja saskarni par brīvu summu
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL piedāvāt %s tiešsaistes maksājumu lietotāja interfeisu locekli abonementu
+ToOfferALinkForOnlinePaymentOnDonation=URL, kas piedāvā %s tiešsaistes maksājumu lietotāja interfeisu ziedojuma apmaksai
 YouCanAddTagOnUrl=Jūs varat arī pievienot url parametrs <b>&amp; Tag = <i>vērtība,</i></b> kādu no šiem URL (nepieciešams tikai bezmaksas samaksu), lai pievienotu savu maksājumu komentāru tagu.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup savu Paybox ar url <b>%s</b> ir maksājums izveidots automātiski, kad apstiprinājis Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Izveidojiet savu Paybox ar URL <b> %s </b>, lai maksājums tiktu izveidots automātiski, ja to apstiprina Paybox.
 YourPaymentHasBeenRecorded=Šajā lapā apliecina, ka jūsu maksājums ir reģistrēts. Paldies.
 YourPaymentHasNotBeenRecorded=Jūsu maksājums NAV reģistrēts un darījums ir atcelts. Paldies.
 AccountParameter=Konta parametri
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index a8a6b9a2638..6b6d3ff01aa 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -55,7 +55,7 @@ NoDraftProposals=Nav sagatavot priekšlikumus
 CopyPropalFrom=Izveidot komerciālo priekšlikumu, kopējot esošo priekšlikumu
 CreateEmptyPropal=Izveidojiet tukšus komerciālus priekšlikumus vai produktu / pakalpojumu sarakstu
 DefaultProposalDurationValidity=Default komerciālā priekšlikumu derīguma termiņš (dienās)
-UseCustomerContactAsPropalRecipientIfExist=Izmantojiet klientu kontaktu adresi, ja noteikta nevis trešās puses adresi priekšlikumu saņēmēja adresi
+UseCustomerContactAsPropalRecipientIfExist=Izmantojiet kontaktpersonu / adresi ar veidu "Sazināties ar pēcpārbaudes priekšlikumu", ja tā ir definēta kā trešās puses adrese kā pieteikuma saņēmēja adrese
 ClonePropal=Klonēt tirdzniecības priekšlikumu
 ConfirmClonePropal=Vai tiešām vēlaties klonēt komerciālo priekšlikumu <b> %s </b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 58c2756da4c..7b7f4383464 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -13,7 +13,7 @@ WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript failu saturs (kopīgs visām lapām)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotfails (robots.txt)
-WEBSITE_HTACCESS=Tīmekļa vietne .htaccess fails
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML virsraksts (tikai šai lapai)
 PageNameAliasHelp=Lapas nosaukums vai pseidonīms. <br> Šis aizstājvārds tiek izmantots arī, lai izveidotu SEO vietrādi, ja vietne tiek izmantota no Web servera virtuālās saimniekdatora (piemēram, Apacke, Nginx, ...). Izmantojiet pogu "<strong> %s </strong>, lai rediģētu šo aizstājvārdu.
 EditTheWebSiteForACommonHeader=Piezīme: ja vēlaties norādīt personalizētu galveni visām lapām, rediģējiet virsrakstu vietnes līmenī, nevis lapā / konteinerā.
@@ -54,7 +54,7 @@ YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot re
 YouCanEditHtmlSource=<br> <span class = "fa fa-bug"> </ span> Jūs varat iekļaut PHP kodu šajā avotā, izmantojot tagus <strong> &lt;? php? &gt; </ strong>. Pieejami šādi globālie mainīgie: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs. <br> <br> <span class = "fa fa-bug"> </ span> Jūs var iekļaut arī citu lapas / konteinera saturu ar šādu sintaksi: <br> <strong> &lt;? php includeContainer ('alias_of_container_to_include'); ? &gt; </ strong> <br> <br> <span class = "fa fa-bug"> </ span> Jūs varat veikt novirzīšanu uz citu lapu / konteineru ar šādu sintaksi (Piezīme: novirzīšana): <br> <strong> &lt;? php redirectToContainer ('alias_ofcontainer_to_redirect_to'); ? &gt; </ strong> <br> <br> <span class = "fa fa-link"> </ span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi: <br> <strong> &lt;a href = "alias_of_page_to_link_to .php "&gt;mylink&lt;a&gt; </ strong> <br> <br> <span class =" fa fa-download "> </ span> Lai iekļautu <strong> saiti, lai lejupielādētu </ strong> failu, kas saglabāts <strong> dokumentiem </ strong>, izmantojiet iesaiņojuma <strong> document.php </ strong> mapi: <br> Piemēram, failam dokumentos / ecm (jāreģistrē) sintakse ir: <br> <strong> &lt;a href = "/ document.php? modulepart = ecm & file = [relative_dir /] filename.ext" &gt; </ strong> <br> Ja failā ir dokumenti / mediji (atvērtā direktorijā publiskai piekļuvei), sintakse ir: <br> < strong> &lt;a href = "/ document.php? modulepart = media & file =" [relative_dir /] filename.ext "&gt; </ strong> <br> par failu, kas koplietots ar koplietošanas saiti (atvērtā piekļuve, izmantojot faila koplietošanas hash atslēgu) , sintakse ir: <br> <strong> &lt;a href = "/ document.php? hashp = publicsharekeyoffile" &gt; </ strong> <br> <br> <span clas s = "fa fa-picture-o"> </ span> Lai iekļautu <strong> attēlu </ strong>, kas saglabāts direktorijā <strong> documents </ strong>, izmantojiet <strong> viewimage.php </ strong > iesaiņojums: <br> Piemērs, lai attēls būtu pieejams dokumentos / plašsaziņas līdzekļos (atvērtā direktorijā publiskai piekļuvei), sintakse ir: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename .ext "&gt; </ strong> <br>
 ClonePage=Klonēt lapu / konteineru
 CloneSite=Klonēt vietni
-SiteAdded=Pievienota vietne
+SiteAdded=Website added
 ConfirmClonePage=Lūdzu, ievadiet jaunās lapas kodu / aizstājvārdu un, ja tas ir klonētas lapas tulkojums.
 PageIsANewTranslation=Jaunā lapa ir pašreizējās lapas tulkojums?
 LanguageMustNotBeSameThanClonedPage=Jūs klons lapas kā tulkojumu. Jaunās lapas valodai jābūt atšķirīgai no avota lapas valodas.
@@ -68,8 +68,8 @@ ImportSite=Importēt vietnes veidni
 IDOfPage=Lapas ID
 Banner=Baneris
 BlogPost=Emuāra ziņa
-WebsiteAccount=Vietnes konts
-WebsiteAccounts=Vietnes konti
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Izveidot mājas lapas kontu
 BackToListOfThirdParty=Atpakaļ uz trešo pušu sarakstu
 DisableSiteFirst=Vispirms atspējojiet vietni
@@ -78,7 +78,7 @@ AnotherContainer=Vēl viens konteiners
 WEBSITE_USE_WEBSITE_ACCOUNTS=Iespējot tīmekļa vietnes kontu tabulu
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Iespējojiet tabulu, lai saglabātu tīmekļa vietnes kontus (login / pass) katram vietnei / trešās puses kontam
 YouMustDefineTheHomePage=Vispirms ir jādefinē noklusējuma sākumlapa
-OnlyEditionOfSourceForGrabbedContentFuture=Brīdinājums: tīmekļa lapas izveide, importējot ārēju tīmekļa lapu, ir rezervēta pieredzējušam lietotājam. Atkarībā no avota lapas sarežģītības, importēšanas rezultāts var atšķirties, kad tas tiek importēts no oriģināla. Arī tad, ja avota lapā tiek izmantots visbiežāk izmantotais CSS stils vai nesaderīgs javascript, tad, strādājot šajā lapā, tas var pārtraukt tīmekļa vietnes redaktora izskatu vai funkcijas. Šī metode ir ātrāks veids, kā izveidot lapu, bet tā tiek ieteikta, lai izveidotu savu jauno lapu no jauna vai no ieteiktās lapas veidnes. <br> Jāņem vērā arī tas, ka tikai HTML avota izdevums būs pieejams tikai tad, ja lapas saturs ir inicializēts, satverot tas no ārējās lapas ("Online" redaktors NĒ būs pieejams)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Tikai HTML avota izdevums ir pieejams, ja saturs tiek satverts no ārējas vietnes
 GrabImagesInto=Grab arī attēlus, kas atrodami CSS un lapā.
 ImagesShouldBeSavedInto=Attēli jāuzglabā mapē
@@ -89,7 +89,7 @@ CorporateHomePage=Korporatīvā mājas lapa
 EmptyPage=Tukša lapa
 ExternalURLMustStartWithHttp=Ārējam URL ir jāsākas ar http: // vai https: //
 ZipOfWebsitePackageToImport=Zip faila vietnes pakotne
-ShowSubcontainers=Rādīt iekļautos konteinerus
+ShowSubcontainers=Iekļaut dinamisko saturu
 InternalURLOfPage=Lapas iekšējais URL
 ThisPageIsTranslationOf=Šī lapa / konteiners ir tulkojums
 ThisPageHasTranslationPages=Šajā lapā / konteinerā ir tulkojums
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 83a7073148c..1571a2abc65 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 1d42581c344..37a1d03a2d3 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index f76ff018f9d..ed988d580e2 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/mk_MK/commercial.lang
+++ b/htdocs/langs/mk_MK/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/mk_MK/dict.lang b/htdocs/langs/mk_MK/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/mk_MK/dict.lang
+++ b/htdocs/langs/mk_MK/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/mk_MK/ecm.lang
+++ b/htdocs/langs/mk_MK/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mk_MK/help.lang b/htdocs/langs/mk_MK/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/mk_MK/help.lang
+++ b/htdocs/langs/mk_MK/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 9dda1818253..7bf25b8fa45 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/mk_MK/paybox.lang b/htdocs/langs/mk_MK/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/mk_MK/paybox.lang
+++ b/htdocs/langs/mk_MK/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/mk_MK/propal.lang b/htdocs/langs/mk_MK/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/mk_MK/propal.lang
+++ b/htdocs/langs/mk_MK/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 08508d4e6e8..8d6e8e39b04 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 1d42581c344..37a1d03a2d3 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index f76ff018f9d..ed988d580e2 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/mn_MN/commercial.lang b/htdocs/langs/mn_MN/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/mn_MN/commercial.lang
+++ b/htdocs/langs/mn_MN/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/mn_MN/dict.lang b/htdocs/langs/mn_MN/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/mn_MN/dict.lang
+++ b/htdocs/langs/mn_MN/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/mn_MN/ecm.lang b/htdocs/langs/mn_MN/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/mn_MN/ecm.lang
+++ b/htdocs/langs/mn_MN/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mn_MN/help.lang b/htdocs/langs/mn_MN/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/mn_MN/help.lang
+++ b/htdocs/langs/mn_MN/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/mn_MN/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/mn_MN/holiday.lang
+++ b/htdocs/langs/mn_MN/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 50b93cb6048..17ac06aa403 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/mn_MN/paybox.lang b/htdocs/langs/mn_MN/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/mn_MN/paybox.lang
+++ b/htdocs/langs/mn_MN/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/mn_MN/propal.lang b/htdocs/langs/mn_MN/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/mn_MN/propal.lang
+++ b/htdocs/langs/mn_MN/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 3d5bc3815c8..82c244a10f4 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -36,8 +36,12 @@ AlreadyInGeneralLedger=Allerede journalført i hovedbøker
 NotYetInGeneralLedger=Ikke ennå journalisert i ledgers
 GroupIsEmptyCheckSetup=Gruppen er tom, sjekk oppsettet for den personlige regnskapsgruppen
 DetailByAccount=Vis detaljer etter konto
-AccountWithNonZeroValues=Kontoer med ingen nullverdier
+AccountWithNonZeroValues=Kontoer med ikke-nullverdier
 ListOfAccounts=Liste over kontoer
+CountriesInEEC=Land i EEC
+CountriesNotInEEC=Land ikke i EEC
+CountriesInEECExceptMe=Land i EEC unntatt %s
+CountriesExceptMe=Alle land unntatt %s
 
 MainAccountForCustomersNotDefined=Hoved regnskapskonto for kunder som ikke er definert i oppsettet
 MainAccountForSuppliersNotDefined=Hovedregnskapskonto for leverandører som ikke er definert i oppsettet
@@ -58,7 +62,7 @@ AccountancyAreaDescVat=TRINN %s: Definer regnskapskonto for hver MVA-sats. Bruk
 AccountancyAreaDescDefault=TRINN %s: Definer standard regnskapskontoer. For dette, bruk menyoppføringen %s.
 AccountancyAreaDescExpenseReport=TRINN %s: Definer standard regnskapskontoer for hver type kostnadsrapport. Bruk menyoppføringen %s.
 AccountancyAreaDescSal=TRINN %s: Definer standard regnskapskonto for betaling av lønn. Bruk menyoppføring %s.
-AccountancyAreaDescContrib=TRINN %s: Definer standard regnskapskonto for spesialutgifter (diverse avgifter). Bruk menyoppføringen %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
 AccountancyAreaDescDonation=TRINN %s: Definer standard regnskapskonto for donasjoner. Bruk menyoppføringen %s.
 AccountancyAreaDescMisc=TRINN %s: Definer obligatorisk standardkonto og standard regnskapskontoer for diverse transaksjoner. Bruk menyoppføringen %s.
 AccountancyAreaDescLoan=TRINN %s: Definer standard regnskapskonto for lån. Bruk menyoppføringen %s.
@@ -156,6 +160,7 @@ Docref=Referanse
 LabelAccount=Kontoetikett
 LabelOperation=Etikettoperasjon
 Sens=som betyr
+LetteringCode=Brevkode
 Codejournal=Journal
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
@@ -198,13 +203,13 @@ PaymentsNotLinkedToProduct=Betaling ikke knyttet til noen vare/tjeneste
 
 Pcgtype=Kontogruppe
 Pcgsubtype=Konto-undergruppe
-PcgtypeDesc=Gruppe og undergruppe av konto brukes som forhåndsdefinerte "filter"- og "grupperings" -kriterier for enkelte regnskapsrapporter. For eksempel brukes "Inntekt" eller "Utgift som grupper for regnskapskontoer for produkter for å bygge utgifts-/inntektsrapporten.
+PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
 TotalVente=Total omsetning før skatt
 TotalMarge=Total salgsmargin
 
 DescVentilCustomer=Liste over kunde-fakturalinjer (bundet eller ikke) til en vare-regnskapskonto
-DescVentilMore=I de fleste tilfeller, hvis du bruker forhåndsdefinerte varer eller tjenester, og du setter kontonummeret på vare/tjeneste-kortet, vil programmet være i stand til å gjøre alle bindinger mellom fakturalinjer og regnskapskonto i din kontoplan, bare med et enkelt klikk på knappen <strong>"%s"</strong>. Hvis kontoen ikke ble satt på vare-/tjenestekortet eller hvis du fortsatt har noen linjer ikke bundet til noen konto, må du foreta en manuell binding fra menyen "<strong>%s</strong>".
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Liste over kunde-fakturalinjer og deres vare-regnskapskontoer
 DescVentilTodoCustomer=Bind fakturalinjer som ikke allerede er bundet, til en vare-regnskapskonto
 ChangeAccount=Endre regnskapskonto for valgte vare-/tjenestelinjer til følgende konto:
@@ -213,7 +218,7 @@ DescVentilSupplier=Liste over leverandør-fakturalinjer som er bundet eller ikke
 DescVentilDoneSupplier=Liste over leverandør-fakturalinjer av og deres regnskapskonto
 DescVentilTodoExpenseReport=Bind utgiftsrapport-linjer til en gebyr-regnskapskonto
 DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til en gebyr-regnskapskonto
-DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsrapport-linjer, vil programmet være i stand til å gjøre alle bindinger mellom utgiftsrapport-linjer og regnskapskontoer med et klikk på knappen <strong>"%s"</strong>. Hvis du fortsatt har noen linjer som ikke er bundet til en konto, må du foreta en manuell binding fra menyen "<strong>%s</strong>".
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Liste over utgiftsrapport-linjer og tilhørende gebyr-regnskapskonto
 
 ValidateHistory=Bind automatisk
@@ -221,6 +226,7 @@ AutomaticBindingDone=Automatisk binding utført
 
 ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
 MvtNotCorrectlyBalanced=Bevegelse er ikke riktig balansert. Debet = %s | Kreditt = %s
+Balancing=Balancing
 FicheVentilation=Binding-kort
 GeneralLedgerIsWritten=Transaksjoner blir skrevet inn i hovedboken
 GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke journalføres. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var journalført.
@@ -232,7 +238,7 @@ NotYetAccounted=Ikke regnskapsført i hovedboken enda
 
 ## Admin
 ApplyMassCategories=Masseinnlegging av kategorier
-AddAccountFromBookKeepingWithNoCategories=Tilgjengelig konto er ennå ikke i en personlig gruppe
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in a personalized group
 CategoryDeleted=Kategori for regnskapskontoen er blitt slettet
 AccountingJournals=Regnskapsjournaler
 AccountingJournal=Regnskapsjournal
@@ -262,7 +268,8 @@ Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksporter mot EBP
 Modelcsv_cogilog=Eksport mot Cogilog
 Modelcsv_agiris=Export mot Agiris
-Modelcsv_configurable=Eksport konfigurerbar
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC (Art. L47 A) (Test)
 ChartofaccountsId=Kontoplan ID
 
 ## Tools - Init accounting account on product / service
@@ -292,15 +299,15 @@ ErrorNoAccountingCategoryForThisCountry=Ingen regnskapskonto-gruppe tilgjengelig
 ErrorInvoiceContainsLinesNotYetBounded=Du prøver å journalføre noen linjer i fakturaen <strong> %s </strong>, men noen andre linjer er ennå ikke bundet til en regnskapskonto. Journalføring av alle fakturalinjer for denne fakturaen blir avvist.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Noen linjer på fakturaen er ikke bundet til en regnskapskonto.
 ExportNotSupported=Eksportformatet som er satt  opp støttes ikke på denne siden
-BookeppingLineAlreayExists=Linjene eksisterer allerede i bokføringen
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
 NoJournalDefined=Ingen journal definert
 Binded=Bundne linjer
 ToBind=Linjer som skal bindes
-UseMenuToSetBindindManualy=Autodeteksjon ikke mulig, bruk menyen <a href="%s"> %s </a> for å gjøre bindingen manuelt
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
 
-WarningReportNotReliable=Advarsel, denne rapporten er ikke basert på hovedboken, så den inneholder ikke transaksjoner endret manuelt i hovedboken. Hvis journaliseringen din er oppdatert, er bokføringsvisningen mer nøyaktig.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Utgiftsrapport-journal
 InventoryJournal=Inventar-journal
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index bf3a34128a9..da830fa83f3 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funksjonen er slått av i demo
 FeatureAvailableOnlyOnStable=Egenskapen er kun tilgjengelig på offisielle, stabile versjoner
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Finn eksterne apper/moduler
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multimodulverktøy
 ModuleFamilyExperimental=Eksperimentelle moduler
 ModuleFamilyFinancial=Finansielle moduler (Regnskap/Likviditet)
 ModuleFamilyECM=Håndtering av elektronisk innhold (ECM)
-ModuleFamilyPortal=Websider og andre frontapplikasjoner
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Grensesnitt mot eksterne systemer
 MenuHandlers=Menyhåndtering
 MenuAdmin=Menyredigering
@@ -463,9 +463,9 @@ ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=This module needs the module(s)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br> For skjema for å lage en ny tredjepart, er det <strong> %s</strong>, <br> Hvis du bare vil ha standardverdi hvis url har noen parameter, kan du bruke <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Aktiver bruk av personlige standardverdier
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Brukere og grupper
 Module0Desc=Håndtering av Brukere/Ansatte og Grupper
 Module1Name=Third Parties
-Module1Desc=Behandling av bedrifter og kontaktpersoner
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Handel
 Module2Desc=Behandling av handelsfunksjoner
 Module10Name=Regnskap
@@ -501,7 +501,7 @@ Module23Desc=Overvåking av energiforbruk
 Module25Name=Kundeordre
 Module25Desc=Behandling av kundeordre
 Module30Name=Fakturaer
-Module30Desc=Behandling av fakturaer og kreditnotaer for kunder. Fakturabehandling for leverandører
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Leverandører
 Module40Desc=Leverandører og kjøpshåndtering (innkjøpsordre og fakturering)
 Module42Name=Feilsøkingslogger
@@ -902,7 +902,7 @@ DictionaryVAT=MVA satser
 DictionaryRevenueStamp=Beløp for skattestempel
 DictionaryPaymentConditions=Betalingsbetingelser
 DictionaryPaymentModes=Betalingsmåter
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type nettsider/containere
 DictionaryEcotaxe=Miljøgebyr (WEEE)
 DictionaryPaperFormat=Papirformater
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Lokale skatter-rapportene viser totalt salg
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Ved månedsslutt
 CurrentNext=Nåværende/Neste
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Hendelser relatert til sikkerhet
-Audit=Revisjon
+Audit=Security events
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om nettleser
 InfoOS=Om OS
@@ -1065,7 +1066,7 @@ BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
 SecurityEventsPurged=Sikkerhetshendelser renset
-LogEventDesc=Her kan du slå på loggen for sikkerhetshendelser i Dolibarr. Administratorer kan da se innholdet i loggene via menyen <b>Systemverktøy - Revisjon</b>. OBS! Denne funksjonen kan ta opp mye plass i databasen!
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er bare tilgjengelig for administratorer. Ingen av tillatelsene i Dolibarr kan senke denne grensen.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Avrundingstrinn (for land der avrunding er gjort annerled
 UnitPriceOfProduct=Netto enhetspris på en vare
 TotalPriceAfterRounding=Total pris (netto / moms / inkl. moms) etter avrunding
 ParameterActiveForNextInputOnly=Innstillingene gjelder først fra neste inntasting
-NoEventOrNoAuditSetup=Ingen sikkerhetsinnstillinger er registrert ennå. Dette kan være normalt hvis revisjon ikke er slått på  ("innstillinger - sikkerhet - revisjon").
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Se lokalt sendmail-oppsett
 BackupDesc=For å lage en komplett sikkerhetskopi av Dolibarr, må du:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Komplementære attributter (fakturalinjermaler )
 ExtraFieldsSupplierOrdersLines=Komplementære attributter (ordrelinjer)
 ExtraFieldsSupplierInvoicesLines=Komplementære attributter (fakturalinjer)
 ExtraFieldsThirdParties=Komplementære attributter (tredjepart)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Komplementære attributter (medlem)
 ExtraFieldsMemberType=Komplementære attributter (medlem type)
 ExtraFieldsCustomerInvoices=Tilleggsattributter (faktura)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Liste over varslinger pr. bruker*
 ListOfNotificationsPerUserOrContact=Liste over varslinger pr. bruker* eller pr. kontakt**
 ListOfFixedNotifications=Liste over faste varslinger
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Gå til fanen "Notefikasjoner" hos en tredjepart for å legge til notifikasjoner for kontakter/adresser
 Threshold=Terskel
 BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Postnummer
 ##### Resource ####
 ResourceSetup=Oppsett av Ressursmodulen
 UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index d9e8f54827c..0205cfcb31d 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -31,14 +31,15 @@ ViewWeek=Ukesvisning
 ViewPerUser=Visning pr. bruker
 ViewPerType=Pr. type-visning
 AutoActions= Automatisk utfylling
-AgendaAutoActionDesc= Her defineres hendelser som du vil at Dolibarr skal opprette automatisk i agenda. Hvis ingenting er avkrysset, vil bare manuelle handlinger bli inkludert i logg og synlig i agenda. Automatisk sporing av forretningshandlinger gjort på objekter (validering, statusendring ) vil ikke bli lagret.
-AgendaSetupOtherDesc= Her kan du gjøre andre innstillinger i agendamodulen.
+AgendaAutoActionDesc= Her kan du definere hendelser som du vil at Dolibarr skal lage automatisk i Agenda. Hvis ingenting er merket, vil bare manuelle handlinger bli inkludert i loggene og vises i Agenda. Automatisk sporing av virksomhetshandlinger gjort på objekter (validering, statusendring) blir ikke lagret.
+AgendaSetupOtherDesc= Denne siden gir muligheter for å tillate eksport av Dolibarr-hendelsene til en ekstern kalender (thunderbird, google kalender, ...)
 AgendaExtSitesDesc=Denne siden lar deg sette opp eksterne kalendere for å visning i Dolibarr agenda.
 ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen
-EventRemindersByEmailNotEnabled=Hendelsespåminnelser via e-post ble ikke aktivert i oppsett av Agenda-modulen.
+EventRemindersByEmailNotEnabled=Hendelsespåminnelser via e-post ble ikke aktivert i %s moduloppsett.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s opprettet
 ContractValidatedInDolibarr=Kontrakt %s validert
+CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
 PropalClosedSignedInDolibarr=Tilbud %s signert
 PropalClosedRefusedInDolibarr=Tilbud %s avvist
 PropalValidatedInDolibarr=Tilbud godkjent
@@ -100,7 +101,7 @@ AgendaUrlOptions3=<b>logina=%s</b> for å begrense resultat til hendelser eiet a
 AgendaUrlOptionsNotAdmin=<b>logina=%s</b> for å begrense utdata til handlinger som ikke eies av brukeren <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> for å begrense utdata til handlinger som er tildelt brukeren <b> %s </b>(eier og andre).
 AgendaUrlOptionsProject=<b>project=__ PROJECT_ID__</b> for å begrense resultat til handlinger knyttet til prosjektet <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b> notactiontype=systemauto </b> for å ekskludere automatisk hendelse.
+AgendaUrlOptionsNotAutoEvent=<b> notactiontype=systemauto </b> for å ekskludere automatiske hendelser.
 AgendaShowBirthdayEvents=Vis kontakters fødselsdager
 AgendaHideBirthdayEvents=Skjul kontakters fødselsdager
 Busy=Opptatt
@@ -110,9 +111,9 @@ DefaultWorkingHours=Standard arbeidstid (f.eks 9-18)
 # External Sites ical
 ExportCal=Eksporter kalender
 ExtSites=Importer eksterne kalendere
-ExtSitesEnableThisTool=Vis eksterne kalendere (definert i global setup) i agenda. Påvirker ikke eksterne kalendere definert av brukere.
+ExtSitesEnableThisTool=Vis eksterne kalendere (definert i global oppsett) i Agenda. Påvirker ikke eksterne kalendere som er definert av brukere.
 ExtSitesNbOfAgenda=Antall kalendere
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=Kalender nr. %s
 ExtSiteUrlAgenda=URL til. ical-fil
 ExtSiteNoLabel=Ingen beskrivelse
 VisibleTimeRange=Synlig tidsområde
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 1593e9d4c68..60248f9fa90 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -7,7 +7,7 @@ BankName=Banknavn
 FinancialAccount=Konto
 BankAccount=Bankkonto
 BankAccounts=Bankkonti
-BankAccountsAndGateways=Bankkontoer | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Vis konto
 AccountRef=Kontonummer hovedbokskonto
 AccountLabel=Kontonavn hovedbokskonto
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Kontoadresse
 BankAccountCountry=Konto land
 BankAccountOwner=Kontoeier
 BankAccountOwnerAddress=Kontoeiers adresse
-RIBControlError=Integritetssjekk feilet. Dette betyr at informasjon om denne kontoen er ufullstendig eller feil (sjekk land, nummer og IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Opprett konto
 NewBankAccount=Ny konto
 NewFinancialAccount=Ny hovedbokskonto
@@ -76,6 +76,7 @@ TransactionsToConciliate=Oppføringer til avstemming
 Conciliable=Kan avstemmes
 Conciliate=Avstem
 Conciliation=Avstemming
+SaveStatementOnly=Save statement only
 ReconciliationLate=Avstemming forsinket
 IncludeClosedAccount=Ta med lukkede konti
 OnlyOpenedAccount=Kun åpne konti
@@ -104,7 +105,7 @@ SocialContributionPayment=Betaling av skatter og avgifter
 BankTransfer=Bankoverføring
 BankTransfers=Bankoverføringer
 MenuBankInternalTransfer=Intern overførsel
-TransferDesc=Når du overfører fra en konto til en annen, vil Dolibarr opprette to poster (Debet i kildekonto og kredit i målkonto. Samme beløp (bortsett fra fortegn), etikett og dato vil bli brukt i denne transaksjonen)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overføring fra <b>%s</b> til <b>%s</b> på <b>%s</b> %s er registrert.
@@ -135,8 +136,8 @@ BankTransactionLine=Bankoppføring
 AllAccounts=Alle bank- og kontantkontoer
 BackToAccount=Tilbake til kontoen
 ShowAllAccounts=Vis for alle kontoer
-FutureTransaction=Fremtidig transaksjon. Ingen måte å avstemme.
-SelectChequeTransactionAndGenerate=Velg/filter sjekker for å inkludere sjekkinnskuddskvitteringen og klikk på &quot;Create&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Velg kontoutskriften som hører til avstemmingen. Bruke en sorterbar numerisk verdi: YYYYMM eller YYYYMMDD
 EventualyAddCategory=Til slutt, velg en kategori for å klassifisere postene
 ToConciliate=Slå sammen?
@@ -153,7 +154,7 @@ RejectCheckDate=Dato for returnert sjekk
 CheckRejected=Returnert sjekk
 CheckRejectedAndInvoicesReopened=Returnert sjekk og faktura gjenåpnet
 BankAccountModelModule=Dokumentmaler for bankkontoer
-DocumentModelSepaMandate=Mal for SEPA-mandat. Gjelder kun EU.
+DocumentModelSepaMandate=Mal av SEPA mandat. Bare nyttig for europeiske land i EEC .
 DocumentModelBan=Mal for å skrive ut en side med BAN-informasjon
 NewVariousPayment=Nye diverse betaling
 VariousPayment=Diverse utbetalinger
@@ -162,4 +163,6 @@ ShowVariousPayment=Vis diverse betalinger
 AddVariousPayment=Legg til Diverse betalinger
 SEPAMandate=SEPA mandat
 YourSEPAMandate=Ditt SEPA-mandat
-FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å gjøre debitering til din bank. Send det i retur signert (skanning av det signerte dokumentet og send det via post) til
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index f77e08a189b..5bc8ca2142d 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen verdi i regnskapsføring.
 InvoiceReplacement=Erstatningsfaktura
 InvoiceReplacementAsk=Erstatningsfaktura for faktura
-InvoiceReplacementDesc=<b>Erstatningsfaktura</b> brukes til å avbryte og erstatte en faktura uten at betaling allerede er mottatt. <br><br> Merk: Bare faktura uten innbetaling kan erstattes. Hvis ikke faktura er lukket, vil den bli automatisk satt til 'forlatt'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota for å korrigere faktura
-InvoiceAvoirDesc=En <b>kreditnota</b> er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer.).<br><br>Obs!: Originalfakturaen må allerede være lukket ('betalt' eller 'delbetalt') for at du skal kunne opprette en kreditnota mot den.
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Opprett kreditnota med opprinnelige fakturalinjer
 invoiceAvoirWithPaymentRestAmount=Lag kreditnota pålydende restbeløp fra faktura
 invoiceAvoirLineWithPaymentRestAmount=Kreditnota for restbeløp
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=i faktura-valuta
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
-ConfirmConvertToReduc=Ønsker du å konvertere denne %s til en absolutt rabatt? <br> Beløpet vil bli lagret og kan brukes som en rabatt på en nåværende eller fremtidig faktura for denne kunden.
-ConfirmConvertToReducSupplier=Ønsker du å konvertere dette %s til en absolutt rabatt? <br> Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller fremtidig faktura for denne leverandøren.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
 ReceivedCustomersPayments=Betalinger mottatt fra kunder
-PayedSuppliersPayments=Betalinger til leverandører
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Mottatte kundebetalinger som trenger godkjenning
 PaymentsReportsForYear=Betalingsrapport for %s
 PaymentsReports=Betalingsrapporter
@@ -91,8 +91,8 @@ PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Beløp til betaling
 ValidatePayment=Godkjenn betaling
 PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
-HelpPaymentHigherThanReminderToPay=NB! Innbetalingen av en eller flere fakturaer er høyere enn restbeløpet. <br> Endre oppføringen eller bekreft for å lage kreditnota av det overskytende for overbetalte fakturaer.
-HelpPaymentHigherThanReminderToPaySupplier=Vær oppmerksom på at betalingsbeløpet på en eller flere regninger er høyere enn gjenstående å betale. <br> Rediger oppføringen din, ellers bekreft og opprett en kredittnota av overskuddet betalt for hver overbetalt faktura.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Merk 'Betalt'
 ClassifyPaidPartially=Merk 'Delbetalt'
 ClassifyCanceled=Merk 'Tapsført'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Lukket (ubetalt)
 BillStatusClosedPaidPartially=Delbetalt
 BillShortStatusDraft=Kladd
 BillShortStatusPaid=Betalt
-BillShortStatusPaidBackOrConverted=Refundert eller konvertert
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Betalt
 BillShortStatusCanceled=Tapsført
 BillShortStatusValidated=Validert
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Ikke refundert
 BillShortStatusClosedUnpaid=Lukket
 BillShortStatusClosedPaidPartially=Delbetalt
 PaymentStatusToValidShort=Til validering
-ErrorVATIntraNotConfigured=Internt MVA-nummer er ikke definert
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Det er ingen forhåndsinnstilt betalingsmåte. Gå til Fakturamodul for å rette dette.
 ErrorCreateBankAccount=Opprett en bankkonto, deretter går du til Oppsett i Fakturamodul for å angi betalingsmetoder
 ErrorBillNotFound=Faktura %s eksisterer ikke
-ErrorInvoiceAlreadyReplaced=Feil: Du prøver å godkjenne en faktura som erstatter faktura %s. Denne er allerede blitt erstattet av faktura %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Feil! Rabatten er allerde blitt benyttet
 ErrorInvoiceAvoirMustBeNegative=Feil! Korrigeringsfaktura må ha negativt beløp
 ErrorInvoiceOfThisTypeMustBePositive=Feil! Denne fakturatypen må ha postitivt beløp
 ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en faktura som er erstattet av en annen faktura som fortsatt er i kladdemodus
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne delen eller en annen er allerede brukt, så rabattserien kan ikke fjernes.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger på faktura
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Er du sikker på at du vil endre fakturaen <b>%s</b> til
 ConfirmCancelBill=Er du sikker på at du vil kansellere faktura <b>%s</b>?
 ConfirmCancelBillQuestion=Hvorfor vil du klassifisere denne fakturaen til "forlatt"?
 ConfirmClassifyPaidPartially=Er du sikker på at du vil endre fakturaen <b>%s</b> til status "betalt"?
-ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hvorfor lukker du denne fakturaen?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Resterende ubetalt <b>(%s%s) </b> er en rabatt gitt fordi betaling ble gjort før forfall.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rabatten.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
 ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvis returnert
 ConfirmClassifyPaidPartiallyReasonOther=Beløpet tapsføres av en annen årsak
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Dette valget er kun mulig hvis fakturaen har en spesiell påskrift. (For eksemple: «Kun MVA-andelen av prisen som faktisk betales gir rett til MVA-fradrag»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=I noen land er dette valget kun mulig hvis fakturaen inneholder en spesiell påskrift.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Bruk dette valget hvis ingen av de andre passer
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=En <b>dårlig kunde</b> er en kunde som nekter å betale.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Dette valget brukes når betalingen ikke er komplett fordi noen varer er returnert
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Bruk dette valget hvis ingen av de andre passer, for eksempel i følgende situasjon:<br>- betaling ikke komplett fordi noen varer er sendt tilbake<br>- ikke betalt fullt ut fordi rabatt er uteglemt<br>I alle tilfelle må beløpet rettes i regnskapssystemet ved å lage en kreditnota.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Annen
 ConfirmClassifyAbandonReasonOtherDesc=Dette valget brukes i alle andre tilfeller. For eksempel fordi du vil lage en erstatningsfaktura.
 ConfirmCustomerPayment=Bekrefter du denne betalingen for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Bekrefter du denne betalingen for <b>%s</b> %s?
 ConfirmValidatePayment=Er du sikker på at du vil validere denne betalingen? Ingen endringer kan utføres etterpå.
 ValidateBill=Valider faktura
 UnvalidateBill=Fjern validering på faktura
-NumberOfBills=Ant. fakturaer
-NumberOfBillsByMonth=Antall fakturaer pr. måned
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Totalbeløp fakturaer
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Sum fakturaer pr. mnd (eks. MVA)
 ShowSocialContribution=Vis skatter og avgifter
 ShowBill=Vis faktura
@@ -260,9 +262,9 @@ Repeatables=Maler
 ChangeIntoRepeatableInvoice=Gjør om til fakturamal
 CreateRepeatableInvoice=Opprett fakturamal
 CreateFromRepeatableInvoice=Opprett fra fakturamal
-CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
-ExportDataset_invoice_1=Oversikt over kundefakturaer og fakturalinjer
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Kundefakturaer og betalinger
 ProformaBill=Proforma faktura
 Reduction=Reduksjon
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Rabatter eller kreditter som allerede er brukt
 CustomerDiscounts=Kunderabatter
 SupplierDiscounts=Leverandørrabatter
 BillAddress=Fakturaadresse
-HelpEscompte=Denne rabatten er gitt fordi kunden betalte før forfall.
-HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som tap.
-HelpAbandonOther=Dette beløpet er tapsført på grunn av feil. (For eksempel feil kunde eller faktura er erstattet av en annen)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Skatter og avgifter ID
 PaymentId=Betalings-ID
 PaymentRef=Betalings-ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Ingen faktura er valgt
 CloneInvoice=Klon faktura
 ConfirmCloneInvoice=Er du sikker på at du vil klone fakturaen <b>%s</b>?
 DisabledBecauseReplacedInvoice=Handling slått av fordi fakturaen er blitt erstattet
-DescTaxAndDividendsArea=Dette området viser en oppsummering av alle betalinger av spesielle utgifter. Kun poster fra inneværende år er inkludert her.
-NbOfPayments=Antall betalinger
+DescTaxAndDividendsArea=Dette området viser summen av alle betalinger til spesielle utgifter. Kun poster fra dette regnskapsåret er tatt med her.
+NbOfPayments=No. of payments
 SplitDiscount=Del rabatt i to
-ConfirmSplitDiscount=Er du sikker på at du vil dele rabatten på<b>%s</b>? %s i 2 mindre rabatter?
-TypeAmountOfEachNewDiscount=Sett inn beløp for hver av de to delene:
-TotalOfTwoDiscountMustEqualsOriginal=Totalen for de to nye rabattene må være lik det originale rabattbeløpet.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Er du sikker på at du vil 
 RelatedBill=Relatert faktura
 RelatedBills=Relaterte fakturaer
 RelatedCustomerInvoices=Relaterte kundefakturaer
 RelatedSupplierInvoices=Relaterte leverandørfakturaer
 LatestRelatedBill=Siste tilknyttede faktura
-WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Verktøy for fletting av PDF 
 AmountPaymentDistributedOnInvoice=Beløp fordelt på faktura
-PaymentOnDifferentThirdBills=Tillat betaling av fakturaer for ulike tredjeparter under samme foreldre-firma
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Betalingsnotat
 ListOfPreviousSituationInvoices=Liste over tidligere delfakturaer
 ListOfNextSituationInvoices=Liste over kommende delfakturaer
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Sjekk
 PaymentTypeShortCHQ=Sjekk
 PaymentTypeTIP=TIP (Dokumenter mot betaling)
 PaymentTypeShortTIP=TIP Betaling
-PaymentTypeVAD=Nettbank
-PaymentTypeShortVAD=Nettbank
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bankremisse
 PaymentTypeShortTRA=Kladd
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Bankopplysninger
 BankCode=Bank code (ikke i Norge)
-DeskCode=Desk code (ikke i Norge)
+DeskCode=Office code
 BankAccountNumber=Kontonummer
-BankAccountNumberKey=Nøkkel
+BankAccountNumberKey=Check digits
 Residence=Direktedebet
-IBANNumber=IBAN-nummer
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT-nummer
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Vennligst betal til følgende bankkonto
 VATIsNotUsedForInvoice=* Avgiftsfritt
 LawApplicationPart1=Alle varer forblir vår eiendom
 LawApplicationPart2=til de er fullt ut betalt.
-LawApplicationPart3=Fakturautsteder har salgspant
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=i leverte varer til de er betalt i sin helhet.
 LimitedLiabilityCompanyCapital=AS med organisajonsnummer
 UseLine=Legg til
@@ -463,7 +465,7 @@ Cheques=Sjekker
 DepositId=Innskudds-ID
 NbCheque=Antall sjekker
 CreditNoteConvertedIntoDiscount=Denne%s er blitt konvertert til %s
-UsBillingContactAsIncoiveRecipientIfExist=Bruk kontaktpersonens adresse i stedet for tredjepartens adresse
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis kun forfalte fakturaer
 PaymentInvoiceRef=Betaling av faktura %s
@@ -474,21 +476,22 @@ Reported=Forsinket
 DisabledBecausePayments=Ikke mulig siden det er noen betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er minst en faktura som er klassifisert som betalt
 ExpectedToPay=Forventet innbetaling
-CantRemoveConciliatedPayment=Kan ikke fjerne avtalt beløp
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Betales av denne innbetalingen
-ClosePaidInvoicesAutomatically=Klassifiser "Betalt" alle standard-, forskuddsbetalings- eller erstatningsfakturaer som er fullstendig betalt.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Klassifiser alle fakturaer som betalt
-ClosePaidContributionsAutomatically=Klassifiser alle fullt betalte sosial- og regnskapsbidrag som "betalt"
-AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten restbeløp vil bli automatisk satt til &quot;betalt&quot;.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
 RevenueStamp=Stempelmerke
-YouMustCreateInvoiceFromThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "kunde" under tredjepart
-YouMustCreateInvoiceFromSupplierThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "leverandør" under tredjepart
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og så konvertere den til "mal" for å lage en ny fakturamal
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF fakturamal Crevette. En komplett mal for delfaktura
 TerreNumRefModelDesc1=Returnerer nummer med format %syymm-nnnn for standardfaktura og %syymm-nnnn for kreditnota, der yy er året, mm måned og nnnn er et løpenummer som starter på 0+1.
 MarsNumRefModelDesc1=Returnerer et nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for nedbetalingsfakturaer og %syymm-nnnn for kreditnotater hvor yy er år, mm er måned og nnnn er en sekvens uten pause og ingen retur til 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Fakturalinje-progresjon kan ikke være lik eller høyer
 updatePriceNextInvoiceErrorUpdateline=Feil: oppdater pris på fakturalinje: %s
 ToCreateARecurringInvoice=For å opprette en gjentakende faktura for denne kontrakten må du først opprette en fakturakladd, og så gjøre den om til en fakturamal, for så å bestemme hvor ofte nye fakturaer skal opprettes
 ToCreateARecurringInvoiceGene=For å opprette fremtidige periodiske fakturaer manuelt, gå til meny <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Hvis du vil opprette slike fakturaer automatisk, ta kontakt med administrator for å aktivere og sette opp modulen <strong>%s</strong>. Husk at begge metoder (manuell og automatisk) kan bruke om hverandre uten fare for duplisering.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Slett fakturamal
 ConfirmDeleteRepeatableInvoice=Er du sikker på at du vil 
 CreateOneBillByThird=Opprett en faktura pr. tredjepart (ellers en faktura pr. ordre)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Angi startdato
 AutoFillDateTo=Angi sluttdato for tjenestelinje med neste faktura dato
 AutoFillDateToShort=Angi sluttdato
 MaxNumberOfGenerationReached=Maks ant. genereringer nådd
+BILL_DELETEInDolibarr=Faktura slettet
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index c641997e701..c0561b46682 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Vis selskap
 ShowStock=Vis lager
 DeleteArticle=Klikk for å fjerne denne artikkelen
 FilterRefOrLabelOrBC=Søk (Referanse/Etikett)
-UserNeedPermissionToEditStockToUsePos=Forespørsel om å redusere varebeholdning ved opprettelse av faktura. POS bruker må ha adgang til å endre varebeholdning
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Etikettskriver
+PointOfSale=Kassaapparat
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index ab81008845e..bc042413e9c 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonsamtale
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send tilbud
 ActionAC_EMAIL=Send epost
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Møter
 ActionAC_INT=Intervensjon på sted
 ActionAC_FAC=Send faktura med post
@@ -60,8 +61,8 @@ ActionAC_CLO=Lukk
 ActionAC_EMAILING=Send e-postutsendelse (masse-epost)
 ActionAC_COM=Send ordre i posten
 ActionAC_SHIP=Send levering i posten
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Send bestillingsordre via epost
+ActionAC_SUP_INV=Send leverandørfaktura via epost
 ActionAC_OTH=Andre
 ActionAC_OTH_AUTO=Automatisk satte hendelser
 ActionAC_MANUAL=Manuelt satte hendelser
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Utkast kommersielle tilbud
 NoLimit=Ingen grense
 ToOfferALinkForOnlineSignature=Link for online signatur
-WelcomeOnOnlineSignaturePage=Velkommen til siden for å godta tilbud %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=Denne siden lar deg godta og signere eller avvise et tilbud
 ThisIsInformationOnDocumentToSign=Dette er informasjon på dokumentet for å godta eller avvise
-SignatureProposalRef=Underskrift av tilbud %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Funksjon for online signering deaktivert eller dokument generert før funksjonen ble aktivert
diff --git a/htdocs/langs/nb_NO/dict.lang b/htdocs/langs/nb_NO/dict.lang
index 9166039bfc3..0471f901546 100644
--- a/htdocs/langs/nb_NO/dict.lang
+++ b/htdocs/langs/nb_NO/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard- og McDonaldøyene
 CountryVA=Holy See (Vatikanet)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Island
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Nord-Korea
 CountryKR=Sør-Korea
 CountryKW=Kuwait
-CountryKG=Kirgisistan
+CountryKG=Kyrgyzstan
 CountryLA=Laos
 CountryLV=Latvia
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mosambik
-CountryMM=Myanmar
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad og Tobago
 CountryTR=Tyrkia
 CountryTM=Turkmenistan
-CountryTC=Turks- og Caicosøyene
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupi
 CurrencySingMUR=Mauritius rupi
 CurrencyNOK=Norske kroner
-CurrencySingNOK=Norske kroner
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisiske dinarer
 CurrencySingTND=Tunisisk dinar
 CurrencyUSD=Amerikanske dollar
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Jungeltelegrafen
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Ansatt
 DemandReasonTypeSRC_SPONSORING=Sponsing
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index f41f468f106..688e58621fa 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Ant. dokumenter i mappen
+ECMNbOfDocs=Antall dokumenter i katalogen
 ECMSection=Mappe
 ECMSectionManual=Manuell mappe
 ECMSectionAuto=Automatisk mappe
@@ -34,18 +34,19 @@ ECMDocsByProjects=Dokumenter relatert til prosjekter
 ECMDocsByUsers=Dokumenter relatert til brukere
 ECMDocsByInterventions=Dokumenter relatert til intervensjoner
 ECMDocsByExpenseReports=Dokumenter lenket til utgiftsrapporter
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Ingen mapper opprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
 ConfirmDeleteSection=Kan du bekrefte at du vil slette mappen <b>%s</b>?
 ECMDirectoryForFiles=Relativ mappe for filer
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Sletting ikke mulig fordi den inneholder noen filer eller underkataloger
+CannotRemoveDirectoryContainsFiles=Sletting ikke mulig fordi den inneholder noen filer
 ECMFileManager=Filbehandler
 ECMSelectASection=Velg en mappe i treet ...
 DirNotSynchronizedSyncFirst=Denne mappen ser ut til å være opprettet eller endret utenfor ECM-modulen. Du må klikke på "Resync" -knappen først for å synkronisere disk og database for å få innhold i denne katalogen.
 ReSyncListOfDir=Resync liste over kataloger
 HashOfFileContent=Hash av filinnhold
-FileNotYetIndexedInDatabase=Filen er ikke indeksert i databasen (prøv å laste den opp igjen)
-FileSharedViaALink=Fil delt via en lenke
 NoDirectoriesFound=Ingen mapper funnet
+FileNotYetIndexedInDatabase=Filen er ikke indeksert i databasen (prøv å laste den opp igjen)
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 3515e5734ae..0be0d4f76ad 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP klienten feilet med meldingen '%s'
 ErrorGlobalVariableUpdater5=Ingen global variabel valgt
 ErrorFieldMustBeANumeric=Feltet <b>%s</b> må være en numerisk verdi
 ErrorMandatoryParametersNotProvided=Obligatorisk(e) parametre ikke angitt
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Kunne ikke laste moduldeskriptorklassen for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=Vare-strekkoden %s finnes allerede i en annen p
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vær også oppmerksom på at bruk av virtuelle varer som har automatisk økning/reduksjon av undervarer, ikke er mulig når minst en undervare (eller undervare av undervarer) trenger et serienummer/lotnummer.
 ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis vare
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
 WarningMandatorySetupNotComplete=Obligatoriske parametre er enda ikke satt opp
diff --git a/htdocs/langs/nb_NO/help.lang b/htdocs/langs/nb_NO/help.lang
index b0ef5240a65..4e6bdcd2064 100644
--- a/htdocs/langs/nb_NO/help.lang
+++ b/htdocs/langs/nb_NO/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online support
 OtherSupport=Annen support
 ToSeeListOfAvailableRessources=For å se tilgjengelige ressurser:
 HelpCenter=Brukerstøtte
-DolibarrHelpCenter=Dolibarr hjelp og support
-ToGoBackToDolibarr=Ellers, klikk <a href="%s">her for å bruke Dolibarr</a>
-TypeOfSupport=Kilde til support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Brukergruppe (gratis)
 TypeSupportCommercial=Kommersiell
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Trenger du support?
 Efficiency=Effektivitet
 TypeHelpOnly=Kun hjelp
 TypeHelpDev=Hjelp + Utvikling
-TypeHelpDevForm=Hjelp + utvikling + Dannelse
-ToGetHelpGoOnSparkAngels1=Noen selskaper kan gi en rask (av og til umiddelbar) og mer effektiv online-support ved å ta kontroll over datamaskinen. Slik hjelp kan bli funnet på <b>%s</b> nettsted:
-ToGetHelpGoOnSparkAngels3=Du kan også gå til listen over alle tilgjengelig support for Dolibarr. For dette, klikk på knappen
-ToGetHelpGoOnSparkAngels2=Noen ganger er det ingen selskap tilgjengelig når du søker. Endre filteret for å se etter "alle tilgjengelige". Du vil da kunne sende flere forespørsler.
-BackToHelpCenter=Ellers, klikk her for å gå <a href="%s">tilbake til hjemmesiden for brukerstøtte</a> .
-LinkToGoldMember=Du kan ringe forhåndsvalgt support fra Dolibarr for ditt språk (%s) ved å klikke dennes Widget (status og maksimumspris blir automatisk oppdatert):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Støttede språk
-SubscribeToFoundation=Hjelp Dolibarr prosjektet, gi en donasjon
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For offisiell Dolibarr support på ditt språk: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index eeaffcd9004..100940fadc4 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Ferier
-CPTitreMenu=Ferier
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Månedlig uttalelse
 MenuAddCP=Ny feriesøknad
-NotActiveModCP=Du må aktivere modulen Ferier for å vise denne siden
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Opprett feriesøknad
 DateDebCP=Startdato
 DateFinCP=Sluttdato
@@ -15,18 +15,18 @@ ApprovedCP=Godkjent
 CancelCP=Kansellert
 RefuseCP=Nektet
 ValidatorCP=Godkjenner
-ListeCP=Liste over ferier
+ListeCP=List of leave
 LeaveId=Ferie-ID
 ReviewedByCP=Vil bli godkjent av
 UserForApprovalID=ID til godkjenningsbruker
-UserForApprovalFirstname=Fornavn godkjenningsbruker
-UserForApprovalLastname=Etternavn godkjenningsbruker
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Innlogging av godkjenningsbruker
 DescCP=Beskrivelse
 SendRequestCP=Opprett feriesøknad
 DelayToRequestCP=Søknader må opprettes minst <b>%s dag(er)</b> før ferien skal starte
-MenuConfCP=Feriebalanse
-SoldeCPUser=Feriebalansen er <b>%s</b> dager.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Sluttdato må være senere en startdato
 ErrorSQLCreateCP=En SQL feil oppsto under opprettelse:
 ErrorIDFicheCP=En feil oppsto. Feriesøknaden finnes ikke
@@ -101,8 +101,8 @@ LEAVE_SICK=Sykefravær
 LEAVE_OTHER=Annen ferie
 LEAVE_PAID_FR=Betalt ferie
 ## Configuration du Module ##
-LastUpdateCP=Siste automatiske oppdatering av ferietildeling
-MonthOfLastMonthlyUpdate=Måned for siste automatiske oppdatering av ferietildeling
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Vellykket oppdatering.
 Module27130Name= Håndtering av feriesøknader
 Module27130Desc= Håndtering av feriesøknader
@@ -112,7 +112,7 @@ NoticePeriod=Oppsigelsestid
 HolidaysToValidate=Valider feriesøknader
 HolidaysToValidateBody=Under er en feriesøknad for validering
 HolidaysToValidateDelay=Denne ferien avvikles innen %s dager
-HolidaysToValidateAlertSolde=Brukeren som sendte inn denne feriesøknaden har ikke nok tilgjengelige dager.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validerte feriesøknader
 HolidaysValidatedBody=Feriesøknaden din for perioden %s til %s er blitt validert
 HolidaysRefused=Søknad avvist
@@ -121,4 +121,9 @@ HolidaysCanceled=Kansellert feriesøknad
 HolidaysCanceledBody=Feriesøknaden din for perioden %s til %s er blitt kansellert.
 FollowedByACounter=1: Denne typen ferie må være etterfulgt av en teller. Telleren økes automatisk eller manuelt, og når ferieforespørselen blir validert, blir den redusert. <br>0: Ikke etterfulgt av en teller
 NoLeaveWithCounterDefined=Det er ikke definert noen ferietyper som trenger en teller
-GoIntoDictionaryHolidayTypes=Gå til <strong>Hjem - Oppsett - Ordlister - Ferietyper</strong> for å sette oppforskjellige typer ferier.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 892400692cb..94e015fce18 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Bare følg instruksjonene trinn for trinn.
 MiscellaneousChecks=Kontroll av forutsetninger 
 ConfFileExists=Konfigurasjonsfil <b>%s</b> eksisterer.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurasjonsfil <b>%s</b> eksisterer ikke og kunne ikke opprettes!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfigurasjonsfil <b>%s</b> kunne lages.
-ConfFileIsNotWritable=Konfigurasjonsfil <b>%s</b> er ikke skrivbar. Sjekk tillatelser. For første gangs installasjon, må webserveren få innvilget å kunne skrive til denne filen under konfigureringen ("chmod 666" for eksempel på et Unix-OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfigurasjonsfil <b>%s</b> er skrivbar.
 ConfFileMustBeAFileNotADir=Konfigurasjonsfil <b> %s </b> må være en fil, ikke en katalog.
-ConfFileReload=Last inn all informasjon fra konfigurasjonsfilen igjen.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Denne PHP støtter sesjoner.
 PHPSupportPOSTGETOk=Dette PHP støtter variablene POST og GET.
-PHPSupportPOSTGETKo=Det er mulig at ditt PHP-oppsett ikke støtter variablene POST og/eller GET. Sjekk parametrene <b>variables_order</b> i php.ini.
-PHPSupportGD=Denne PHP støtter GD grafiske funksjoner.
-PHPSupportCurl=Denne PHP støtter Curl.
-PHPSupportUTF8=Denne PHP støtter UTF8 funksjoner.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Din PHP økt-minne er satt til maks.<b>%s</b> bytes. Dette bør være nok.
-PHPMemoryTooLow=Din PHP max økten minnet er satt til <b>%s</b> bytes. Dette bør være for lav. Endre <b>php.ini</b> å sette <b>memory_limit</b> parameter til minst <b>%s</b> byte.
-Recheck=Klikk her for en mer significative test
-ErrorPHPDoesNotSupportSessions=Din PHP installasjon har ikke støtte for sesjoner. Denne funksjonen er nødvendig for at Dolibarr skal virke. Sjekk ditt PHP-oppsett.
-ErrorPHPDoesNotSupportGD=Din PHP installasjon har ikke støtte for GD-funksjon. Ingen grafer vil være tilgjengelig.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Din PHP-installasjon støtter ikke Curl.
-ErrorPHPDoesNotSupportUTF8=Din PHP installasjon har ikke støtte for UTF8-funksjoner. Dolibarr vil ikke fungere riktig. Løs dette før du installerer Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Mappen %s finnes ikke.
-ErrorGoBackAndCorrectParameters=Gå tilbake for å korrigere feil parametre.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Du har kanskje skrevet feil verdi for parameteren '%s'.
 ErrorFailedToCreateDatabase=Kunne ikke opprette database '%s'.
 ErrorFailedToConnectToDatabase=Kunne ikke koble til database '%s'.
 ErrorDatabaseVersionTooLow=Databaseversjonen (%s) er for gammel. Versjon %s eller senere kreves
 ErrorPHPVersionTooLow=PHP-versjonen er for gammel. Versjon %s er nødvendig.
-ErrorConnectedButDatabaseNotFound=Tilkobling til server vellykket, men database '%s' ikke funnet.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' finnes allerede.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke finnes, gå tilbake og kryss av alternativet "Opprett database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Hvis databasen allerede eksisterer, gå tilbake og fjern "Opprett database" alternativet.
-WarningBrowserTooOld=Nettleseren din er utdatert. Det anbefales å oppgradere til siste versjon av Firefox, Chrome eller Opera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP versjon
 License=Bruk lisens
 ConfigurationFile=Konfigurasjonsfil
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Navn eller IP-adressen til database-serveren, som regel "localhost" når database server ligger på samme server som webserveren
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Hold tomt hvis ukjent.
 DatabaseServer=Databaseserver
 DatabaseName=Databasenavn
-DatabasePrefix=Database prefiks-tabell
-AdminLogin=Logginn for Dolibarr databaseeier.
-PasswordAgain=Skriv inn passordet en gang
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Passord for Dolibarr databaseeier.
 CreateDatabase=Opprett database
-CreateUser=Opprett eier eller gi ham tillatelse på databasen
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Databaseserver - Superbruker tilgang
-CheckToCreateDatabase=Kryss av i boksen hvis databasen ikke finnes og må opprettes.<br> I dette tilfellet må du fylle brukernavn/passord for superbrukerkontoen nederst på denne siden.
-CheckToCreateUser=Kryssrute hvis databaseeier ikke eksisterer og må opprettes, eller hvis den eksisterer, men databasen ikke, og tillatelser må gis. <br> I dette tilfellet må du velge innlogging og passord og også fylle innloggingen/passordet for Superbrukerkontoen nederst på denne siden. Hvis denne boksen ikke er merket, må eierdatabasen og passordene eksistere.
-DatabaseRootLoginDescription=Pålogging til bruker med tillatelse til å opprette nye databaser eller nye brukere, obligatorisk hvis databasen eller dens eier ikke allerede eksisterer.
-KeepEmptyIfNoPassword=La være tomt hvis bruker ikke har passord (unngå dette)
-SaveConfigurationFile=Lagre verdier
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server-tilkobling
 DatabaseCreation=Database opprettelse
 CreateDatabaseObjects=Databaseobjekter opprettelse
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Lag eksterne nøkler og indekser for tabell %s
 OtherKeysCreation=Opprettelse av eksterne nøkler og indekser 
 FunctionsCreation=Opprettelse av funksjoner 
 AdminAccountCreation=Opprettelse av administrator login 
-PleaseTypePassword=Vennligst skriv inn et passord, tomt passord ikke tillatt!
-PleaseTypeALogin=Vennligst skriv inn brukernavn!
-PasswordsMismatch=Feil passord, vennligst prøv igjen!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Slutt på oppsett
 SystemIsInstalled=Denne installasjonen er fullført.
 SystemIsUpgraded=Oppgraderingen av Dolibarr var vellykket.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Du må konfigurere Dolibarr for tilpasning til dine be
 AdminLoginCreatedSuccessfuly=Dolibarr administrator innlogging '<b>%s</b>' opprettet.
 GoToDolibarr=Gå til Dolibarr
 GoToSetupArea=Gå til Dolibarr (Oppsettområdet)
-MigrationNotFinished=Databaseversjonen din ikke er helt oppdatert, så du må kjøre oppgraderingen på nytt.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Gå til oppgraderingssiden igjen
 WithNoSlashAtTheEnd=Uten skråstrek "/" på slutten
-DirectoryRecommendation=Det er anbefalt å bruke en annen katalog enn den for websidene dine.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Finnes allerede
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administratorkonto '<b>%s</b>' finnes allerede.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Klarte ikke å opprette Dolibarr administratorkonto
-WarningRemoveInstallDir=Advarsel, av sikkerhetshensyn, når installasjonen eller oppgraderingen er fullført, bør du fjerne <b>mappen "install" eller endre navnet til install.lock for å unngå skadelig bruk.</b>
-FunctionNotAvailableInThisPHP=Ikke tilgjengelig på denne PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Velg migrasjonscript
 DataMigration=Database migrasjon (data)
 DatabaseMigration=Database migrasjon (struktur + noen data)
 ProcessMigrateScript=Scriptbehandling
 ChooseYourSetupMode=Velg din oppsettmodus og klikk på "Start" ...
 FreshInstall=Ny installasjon
-FreshInstallDesc=Bruk denne modusen hvis dette er første gangs installasjon. Denne modusen kan reparere en ufullstendig tidligere installasjon, men hvis du ønsker å oppgradere din versjon, velg "Oppgrader"-modus.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Oppgrader
 UpgradeDesc=Bruk denne modusen hvis du har erstattet gamle Dolibarr filer med filer fra en nyere versjon. Dette vil oppgradere databasen og dataene dine.
 Start=Start
 InstallNotAllowed=Installasjonsprogrammet kan ikke kjøres grunnet <b>conf.php</b> tillatelser
 YouMustCreateWithPermission=Du må lage filen %s og sette skriverettigheter på den for web-serveren under installasjonsprosessen.
-CorrectProblemAndReloadPage=Rett problemet og trykk F5 for å laste siden på nytt.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Allerede migrert
 DatabaseVersion=Databaseversjon
 ServerVersion=Databaseserver-versjon
 YouMustCreateItAndAllowServerToWrite=Du må lage denne mappen og tiilate web-serveren å skrive til den.
 DBSortingCollation=Sorteringsrekkefølge
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Du prøver å opprette database <b>%s</b>, men for dette må Dolibarr koble til serveren <b>%s</b> med superbruker <b>%s</b> tillatelser.
-YouAskLoginCreationSoDolibarrNeedToConnect=Du prøver å opprette database login <b>%s</b> men for dette må Dolibarr koble til serveren <b>%s</b> med superbruker <b>%s</b> tillatelser.
-BecauseConnectionFailedParametersMayBeWrong=Ettersom tilkobling mislyktes, må vert eller superbruker-parametrene være feil.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Ikke tilknyttede innbetalinger oppdaget av metoden %s
 RemoveItManuallyAndPressF5ToContinue=Fjern det manuelt, og trykk F5 for å fortsette.
 FieldRenamed=Felt omdøpt
-IfLoginDoesNotExistsCheckCreateUser=Hvis login ikke eksisterer ennå, må du sjekke alternativet "Opprett bruker"
-ErrorConnection=Server "<b>%s</b>", databasenavn "<b>%s</b>", logginn "<b>%s</b>", eller database passordet er feil, eller PHP-klient-versjon kan være for gammel i forhold til databaseversjon.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Anbefaler å installere versjon <b>%s</b> i forhold til din nåværende versjon <b>%s</b>
 InstallChoiceSuggested=<b>Installer valg foreslått av installasjonsprogrammet.</b>
-MigrateIsDoneStepByStep=Ønsket versjonen (%s) har et gap på flere versjoner, så installasjonsveiviseren vil komme tilbake for å foreslå neste migrasjon når denne er ferdig.
-CheckThatDatabasenameIsCorrect=Sjekk at databasenavnet "<b>%s</b>" er korrekt.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Hvis dette navnet er riktig, og at databasen ikke eksisterer ennå, må du sjekke alternativet "Opprett database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Du merket "Opprett database". For dette, må du oppgi brukernavn/passord til superbruker (nederst på skjemaet).
-YouAskToCreateDatabaseUserSoRootRequired=Du merket "Opprett databaseeier". For dette, må du oppgi brukernavn/passord til superbruker (nederst på skjemaet).
-NextStepMightLastALongTime=Gjeldende trinn kan vare i flere minutter. Vennligst vent til neste skjermbildet vises helt før du fortsetter.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrer leveranse for lagring avkundeordrer
 MigrationShippingDelivery=Oppgrader lagring av leveranse
 MigrationShippingDelivery2=Oppgrader lagring av leveranse 2
 MigrationFinished=Migrasjon ferdig
-LastStepDesc=<strong>Siste trinn</strong>: Definer login og passord du har tenkt å bruke til å koble til programvaren. Ikke mist dette da det er kontoen for å administrere alle andre.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktiver modulen %s
 ShowEditTechnicalParameters=Klikk her for å vise/endre avanserte parametre (expert mode)
-WarningUpgrade=Advarsel:\nHar du kjørt en database backup først?\nDette er sterkt anbefalt, for eksempel på grunn av noen bugs inn i databasesystemer (MySQL versjon 5.5.40/41/42/43), kan noen data eller tabeller gå tapt i løpet av denne prosessen, så det er sterkt anbefalt å ha en komplett dump av databasen din før du starter migrasjon.\n\nKlikk OK for å starte migreringen ...
-ErrorDatabaseVersionForbiddenForMigration=Din databaseversjon er %s. Den har en kritisk feil som gjør at du mister data hvis du gjør strukturelle endringer i databasen, som vil skje ved migrasjonen. På grunn av dette vil du ikke kunne migrere før databasen er oppgradert til en høyere versjon. (liste over versjoner med bekreftede feil: %s)
-KeepDefaultValuesWamp=Du bruker Dolibarrs konfigureringsveiviser fra DoliWamp, så verdiene foreslått her, er allerede optimalisert. Endre dem bare hvis du vet hva du gjør.
-KeepDefaultValuesDeb=Du bruker Dolibarrs konfigureringsveiviser fra en Linux-pakke (Ubuntu, Debian, Fedora ...), så verdiene foreslått her, er allerede optimalisert. Bare passordet til databaseeieren må  fylles ut. Endre andre parametere bare hvis du vet hva du gjør.
-KeepDefaultValuesMamp=Du bruker Dolibarrs konfigureringsveiviser fra DoliMamp, så verdiene foreslått her, er allerede optimalisert. Endre dem bare hvis du vet hva du gjør.
-KeepDefaultValuesProxmox=Du bruker Dolibarrs konfigureringsveiviser fra en Proxmox virtual appliance, så verdiene foreslått her, er allerede optimalisert. Endre dem bare hvis du vet hva du gjør.
-UpgradeExternalModule=Kjør dedikert oppgradering av eksterne moduler
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Angi minst ett alternativ som et parameter i URL. For eksempel: '... repair.php?standard=confirmed'
 NothingToDelete=Ingenting å rengjøre/slette
 NothingToDo=Ingenting å gjøre
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Dataoverføring for leverandørordre
 MigrationProposal=Datamigrering for tilbud
 MigrationInvoice=Datamigrering for kundefakturaer
 MigrationContract=Datamigrering for kontrakter
-MigrationSuccessfullUpdate=Oppgraderingen var vellykket 
+MigrationSuccessfullUpdate=Oppgradering vellykket
 MigrationUpdateFailed=Oppgraderingsprosessen mislyktes
 MigrationRelationshipTables=Datamigrering for tabellrelasjoner (%s)
 MigrationPaymentsUpdate=Korreksjon av betalingsdata 
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Korreksjon av kontraktsdata
 MigrationContractsNumberToUpdate=%s kontrakt(er) å oppdatere
 MigrationContractsLineCreation=Lag kontraktlinje for kontraktreferanse %s
 MigrationContractsNothingToUpdate=Ingen flere ting å gjøre
-MigrationContractsFieldDontExist=Felt fk_facture eksisterer ikke lenger. Ingenting å gjøre.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Korreksjon av tom dato i kontrakter
-MigrationContractsEmptyDatesUpdateSuccess=Korreksjon av tom dato i kontrakten var vellykket
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Ingen tom dato i kontrakter behøver å korrigeres
 MigrationContractsEmptyCreationDatesNothingToUpdate=Ingen kontrakt-opprettelsesdato å korrigere
 MigrationContractsInvalidDatesUpdate=Feil verdi for korreksjon av kontraktsdato
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Leveringsoppdatering
 MigrationStockDetail=Oppdater lagerverdien av varer
 MigrationMenusDetail=Oppdater dynamiske menytabeller
 MigrationDeliveryAddress=Oppdater leveringsadresser i leveranser
-MigrationProjectTaskActors=Datamigrering for llx_projet_task_actors tabell
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Datamigrering av feltet fk_user_resp av llx_projet å llx_element_contact
 MigrationProjectTaskTime=Oppdater tidsbruk i sekunder
 MigrationActioncommElement=Oppdater data for handlinger
 MigrationPaymentMode=Datamigrering for betalingsmodus
 MigrationCategorieAssociation=Migrer kategorier
-MigrationEvents=Overføring av hendelser for å legge hendelseseier inn i oppdragstabellen
-MigrationEventsContact=Overføring av hendelser for å legge til hendelseskontakt i oppdragstabell
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Oppdater verdien i enhetsfeltet llx_societe_remise
 MigrationRemiseExceptEntity=Oppdater verdien i enhetsfeltet llx_societe_remise_except
 MigrationUserRightsEntity=Oppdater enhetens feltverdi av llx_user_rights
 MigrationUserGroupRightsEntity=Oppdater enhetens feltverdi av llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Last inn modulen %s på nytt
 MigrationResetBlockedLog=Tilbakestill modul BlockedLog for v7 algoritme
-ShowNotAvailableOptions=Vis utilgjengelige opsjoner
-HideNotAvailableOptions=Gjem utilgjengelige opsjoner
-ErrorFoundDuringMigration=Feil ble rapportert under migrasjonsprosessen, så neste steg er ikke tilgjengelig. For å overse feil, kan du <a href="%s">klikke her</a>, men applikasjoner eller noen funksjoner kanskje ikke fungerer som de skal før de er fikset.
-YouTryInstallDisabledByDirLock=Programmet prøver å selv-oppgradere, men installasjons-/oppgraderingssidene er deaktivert av sikkerhetsårsaker (katalog omdøpt med .lock-suffiks). <br>
-YouTryInstallDisabledByFileLock=Programmet prøver å selv-oppgradere, men installasjons-/oppgraderingssider er blitt deaktivert av sikkerhetsårsaker (ved å låse filen <strong> install.lock </strong> i dolibarr-dokumenter katalogen). <br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Klikk her for å gå til din applikasjon
-ClickOnLinkOrRemoveManualy=Klikk på følgende lenke, og hvis du alltid når denne siden, må du fjerne filen install.lock i dokumentkatalogen manuelt
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index fa1566dac40..0d77001a722 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -4,7 +4,7 @@ Interventions=Intervensjoner
 InterventionCard=Intervensjonskort
 NewIntervention=Ny intervensjon
 AddIntervention=Opprett intervensjon
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ChangeIntoRepeatableIntervention=Bytt til repeterbar intervensjon
 ListOfInterventions=Oversikt over intervensjoner
 ActionsOnFicheInter=Handlinger ved intervensjon
 LastInterventions=Siste %s intervensjoner
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 13f3c8ce16a..59986f5b6dd 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakter for denne tredjeparten
 ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresser for tredjepart
 ActionsOnCompany=Handlinger ifm. denne tredjeparten
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Hendelser om dette medlemmet
 ActionsOnProduct=Hendelser om denne varen
 NActionsLate=%s forsinket
@@ -847,9 +848,9 @@ ModuleBuilder=Modulbygger
 SetMultiCurrencyCode=Angi valuta
 BulkActions=Massehandlinger
 ClickToShowHelp=Klikk for å vise verktøytipshjelp
-WebSite=Webside
-WebSites=Nettsteder
-WebSiteAccounts=Nettstedskontoer
+WebSite=Website
+WebSites=Websider
+WebSiteAccounts=Website accounts
 ExpenseReport=Reiseregning
 ExpenseReports=Utgiftsrapporter
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Fil delt via en lenke
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=Du er for øyeblikket i %s "sandbox" -modus
+Inventory=Varetelling
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 8089a1d8672..36a55eeebfc 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Lenkede objekter
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hei)__\nDette er en testmelding sendt til __EMAIL__.\nDe to linjene er skilt fra hverandre med et linjeskift.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hei)__\nDette er en <b> test </b> e-post (ordtesten må være i fet skrift). De to linjene skilles med et linjeskift.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Oppsett av website-modulen
 WEBSITE_PAGEURL=Side-URL
 WEBSITE_TITLE=Tittel
 WEBSITE_DESCRIPTION=Beskrivelse
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Nøkkelord
 LinesToImport=Linjer å importere
diff --git a/htdocs/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang
index 7e7a7be571f..95d16af2c9c 100644
--- a/htdocs/langs/nb_NO/paybox.lang
+++ b/htdocs/langs/nb_NO/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Oppsett av PayBox-modul
 PayBoxDesc=Denne modulen setter oppmulighet for betaling på <a href="http://www.paybox.com" target="_blank">Paybox</a> av kunder. Dette kan brukes for gratis betaling eller for betaling på et bestemt Dolibarr objekt (faktura, ordre, ...)
 FollowingUrlAreAvailableToMakePayments=Følgende nettadresser er tilgjengelige for kundene til å foreta betalinger for Dolibarr objekter
 PaymentForm=Betalingskjema
-WelcomeOnPaymentPage=Velkommen på våre elektroniske betalingstjenester
+WelcomeOnPaymentPage=Velkommen til vår online betalingstjeneste
 ThisScreenAllowsYouToPay=I detteskjermbildet kan du foreta en online betaling til %s.
 ThisIsInformationOnPayment=Betalingsinformasjon
 ToComplete=For å fullføre
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL for å tilby et %s brukergrensesnitt f
 ToOfferALinkForOnlinePaymentOnContractLine=URL for å tilby et %s brukergrensesnitt for online betaling av en kontraktlinje
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL for å tilby et %s brukergrensesnitt for online betaling av et fribeløp beløp
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL for å tilby et %s brukergrensesnitt for online betaling av medlemsabonnement
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Du kan også legge til URL-parameter <b>&tag=<i>verdier</i></b> til noen av disse URLene (kreves kun ved betaling av fribeløp) for å legge til dine egne merknader til betalingen kommentar.
-SetupPayBoxToHavePaymentCreatedAutomatically=Oppsett av din PayBox med url <b>%s</b> for å få betaling opprettet automatisk når  den er validert av paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Denne siden bekrefter at din betaling er registrert. Takk.
-YourPaymentHasNotBeenRecorded=Din betaling ble ikke registrert og transaksjonen har blitt kansellert.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Kontoparametre
 UsageParameter=Parametre for bruk
 InformationToFindParameters=Hjelp til å finne din %s kontoinformasjon
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index 229e172e4c6..fdbd5bb725d 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Akseptert(kan faktureres)
 PropalStatusNotSigned=Ikke akseptert(lukket)
 PropalStatusBilled=Fakturert
 PropalStatusDraftShort=Kladd
-PropalStatusValidatedShort=Validert
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Lukket
 PropalStatusSignedShort=Signert
 PropalStatusNotSignedShort=Ikke signert
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Tilbudet %s ble ikke funnet
 AddToDraftProposals=Legg til tilbudsutkast
 NoDraftProposals=Ingen tilbudsutkast
 CopyPropalFrom=Opprett nytt tilbud ved å kopiere et eksisterende
-CreateEmptyPropal=Opprett tomt tilbud eller fra en liste over varer/tjenester
+CreateEmptyPropal=Opprett et tomt tilbud eller fra listen over varer/tjenester
 DefaultProposalDurationValidity=Standard gyldighetstid for tilbud (dager)
-UseCustomerContactAsPropalRecipientIfExist=Bruk kontaktpersonens adresse (hvis den er definert) i stedet for tredjepartens adresse
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klon tilbud
 ConfirmClonePropal=Er du sikker på at du vil klone tilbudet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på at du vil gjenåpne tilbudet <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kundens tilbudsoppfølger
 TypeContact_propal_external_SHIPPING=Kundekontakt for levering
 # Document models
 DocModelAzurDescription=En fullstendig tilbudsmodell (logo...)
+DocModelCyanDescription=En fullstendig tilbudsmodell (logo...)
 DefaultModelPropalCreate=Standard modellbygging
 DefaultModelPropalToBill=Standardmal når du lukker et tilbud (som skal faktureres)
 DefaultModelPropalClosed=Standardmal når du lukker et tilbud (ufakturert)
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 1b7a7a8aa23..58dade94042 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kode
-WebsiteSetupDesc=Sett inn antall ulike websider du ønsker. Deretter kan du redigere dem under menyen Websider
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Slett wedside
-ConfirmDeleteWebsite=Er du sikker på at du vil slette denne websiden? Alle sider og innhold vil bli slettet.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type side/container
 WEBSITE_PAGE_EXAMPLE=Webside for bruk som eksempel
 WEBSITE_PAGENAME=Sidenavn/alias
 WEBSITE_ALIASALT=Alternative sidenavn/aliaser
+WEBSITE_ALIASALTDesc=Liste over andre navn/aliaser, slik at siden også kan nås med disse andre navnene/aliasene (for eksempel det gamle navnet etter å ha gi nytt navn til aliaset for å holde tilbakekobling på gammel lenke navn fungerende). Syntaks er: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL til ekstern CSS-fil
 WEBSITE_CSS_INLINE=CSS-filinnhold (vanlig for alle sider)
 WEBSITE_JS_INLINE=Javascript-filinnhold (felles for alle sider)
 WEBSITE_HTML_HEADER=Tillegg nederst på HTML-header(felles for alle sider)
 WEBSITE_ROBOT=Robotfil (robots.txt)
-WEBSITE_HTACCESS=Webområde. Htaccess-fil
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML-header (kun for denne siden)
 PageNameAliasHelp=Navn eller alias på siden. <br> Dette aliaset brukes også til å lage en SEO-URL når nettsiden blir kjørt fra en virtuell vert til en webserver (som Apacke, Nginx, ...). Bruk knappen "<strong>%s</strong>" for å redigere dette aliaset.
 EditTheWebSiteForACommonHeader=Merk: Hvis du vil definere en personlig topptekst for alle sider, redigerer du overskriften på nettstedsnivå i stedet for på siden/containeren.
 MediaFiles=Mediabibliotek
-EditCss=Rediger stil/CSS eller HTML-header
+EditCss=Edit website properties
 EditMenu=Rediger meny
 EditMedias=Rediger media
-EditPageMeta=Rediger Metadata
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Legg til nettside
 Webpage=Nettsted/container
 AddPage=Legg til side/container
 HomePage=Hjemmeside
 PageContainer=Side/container
-PreviewOfSiteNotYetAvailable=Forhåndsvisning av websiden din <strong>%s</strong> er ikke tilgjengelig enda. Du må først legge til en side.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Forespurt side med id %s har ikke noe innhold enda, eller cachefilen .tpl.php ble fjernet. Rediger innhold på siden for å løse dette.
+SiteDeleted=Web site '%s' deleted
 PageContent=Side/Container
 PageDeleted=Side/Container '%s' på nettstedet %s slettet
 PageAdded=Side/Container '%s' lagt til
@@ -36,35 +39,37 @@ ViewPageInNewTab=Vis side i ny fane
 SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
-SetHereVirtualHost=Hvis du kan opprette en dedikert Virtual Host med PHP-aktivert og en Root-katalog på  på din webserver (Apache, Nginx, ...) <br> <strong> %s </strong><br>, skriv inn det virtuelle vertsnavnet du har opprettet, her. Slik kan forhåndsvisningen gjøres ved hjelp av denne dedikerte webservertilgangen også, i stedet for bare å bruke Dolibarr-serveren.
-YouCanAlsoTestWithPHPS=I utviklingsmiljø kan du foretrekke å teste nettstedet med PHP-innebygd webserver (PHP 5.5 nødvendig) ved å kjøre %s<strong> php -S 0.0.0.0:8080 -t  </strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=Sjekk også at virtuell vert har tillatelse <strong>%s</strong> på filer til <br><strong>%s</strong>
 ReadPerm=Les
-WritePerm=Write
+WritePerm=Skriv
 PreviewSiteServedByWebServer=<u> Forhåndsvis %s i en ny fane. </u><br><br>%s vil bli servet av en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren før du peker på katalogen:<br><strong>%s</strong><br>URL servet av ekstern server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u> Forhåndsvis %s i en ny fanei.</u><br><br>%s blir servet av Dolibarr-serveren, slik at den ikke trenger at en ekstra webserver (som Apache, Nginx, IIS)  installeres.<br>Ulempen er at nettadressen til sidene ikke er brukervennlig og begynner med banen til Dolibarr. <br> URL servet av Dolibarr:<br><strong>%s</strong> <br> <br> For å bruke din egen eksterne webserver for å betjene dette nettstedet, opprett en virtuell vert på webserveren din som peker på katalogen<br><strong>%s</strong><br>, og skriv deretter inn navnet til denne virtuelle serveren og klikk på den andre forhåndsvisningsknappen .
 VirtualHostUrlNotDefined=URL til ekstern webserver ikke definert
 NoPageYet=Ingen sider ennå
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP-kode i denne kilden ved hjelp av tagger <strong>&lt;?php ?&gt;</strong>. Følgende globale variabler er tilgjengelig: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> Du kan også inkludere innhold fra en annen side/container med følgende syntaks:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Du kan omdirigere til en annen side/container med følgende syntaks:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> For å inkludere en <strong>lenke til å laste ned</strong> en fil, lagret i<strong>dokument-</strong>katalogen, bruk<strong>document.php</strong> wrapper:<br>Eksempel, for en fil i documents/ecm (må logges), ersyntaks:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil i documents/medias (åpen katalog for offentlig adgang), er syntaks:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil delt med en link (åpen adgang ved deling av filers hash-nøkkel), er syntaks:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> For å inkludere et <strong>bilde</strong> lagret i<strong>dokument</strong>-katalogen, bruk <strong>viewimage.php</strong> wrapper:<br>Eksempel, for et bilde i documents/medias (åpen adgang), er syntaks:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Klon side/container
 CloneSite=Klon side
-SiteAdded=Nettsted lagt til
+SiteAdded=Website added
 ConfirmClonePage=Vennligst skriv inn kode/alias for ny side og hvis det er en oversettelse av den klonede siden.
 PageIsANewTranslation=Den nye siden er en oversettelse av gjeldende side?
 LanguageMustNotBeSameThanClonedPage=Du kloner en side som en oversettelse. Språket på den nye siden må være forskjellig fra språket til kildesiden.
 ParentPageId=Foreldre side ID
 WebsiteId=Nettsted-ID
 CreateByFetchingExternalPage=Opprett side/container ved å hente side fra ekstern nettadresse ...
-OrEnterPageInfoManually=Eller opprett en tom side fra grunnen av...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Hent og opprett
-ExportSite=Eksporter nettside
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Side-ID
 Banner=Banner
 BlogPost=Blogg post
-WebsiteAccount=Nettstedskonto
-WebsiteAccounts=Nettstedskontoer
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Opprett nettsidekonto
 BackToListOfThirdParty=Tilbake til listen over tredjeparter
 DisableSiteFirst=Deaktiver nettsted først
@@ -73,7 +78,7 @@ AnotherContainer=En annen container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
 YouMustDefineTheHomePage=Du må først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
 GrabImagesInto=Hent bilder som er funnet i css og side også.
 ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
@@ -82,3 +87,9 @@ SubdirOfPage=Underkatalog dedikert til side
 AliasPageAlreadyExists=Alias ​side <strong> %s </strong> eksisterer allerede
 CorporateHomePage=Firma hjemmeside
 EmptyPage=Tom side
+ExternalURLMustStartWithHttp=Ekstern nettadresse må starte med http:// eller https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
index fd730ac6392..f96ede0982c 100644
--- a/htdocs/langs/nl_BE/website.lang
+++ b/htdocs/langs/nl_BE/website.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 DeleteWebsite=Verwijder website
 ConfirmDeleteWebsite=Weet u zeker dat u deze website wilt verwijderen? Alle pagina's en inhoud worden ook verwijderd.
-WEBSITE_PAGENAME=Paginanaam/alias
 WEBSITE_CSS_URL=URL van extern CSS bestand
 MediaFiles=Mediabibliotheek
 EditMenu=Bewerk menu
@@ -10,5 +9,4 @@ PreviewOfSiteNotYetAvailable=De voorvertoning van uw website <strong>%s</strong>
 ViewSiteInNewTab=Bekijk de site in een nieuwe tab
 ViewPageInNewTab=Bekijk de pagina in een nieuwe tab
 SetAsHomePage=Zet als Homepagina
-RealURL=Echte URL
 ViewWebsiteInProduction=Bekijk website via de home URL's
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 15e3b0e97e2..fbe47553722 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar bij officiële stabiele versies
 BoxesDesc=Widgets zijn componenten die informatie tonen die u kunt toevoegen om sommige pagina's te personaliseren. U kunt kiezen of u de widget wilt weergeven of niet door de doelpagina te selecteren en op 'Activeren' te klikken of door op de prullenbak te klikken om deze uit te schakelen.
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=U kunt meer modules downloaden van externe websites op het internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Vind externe apps of modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
 ModuleFamilyExperimental=Experimentele modules
 ModuleFamilyFinancial=Financiële Modules (Boekhouding / Bedrijfsfinanciën)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites en andere frontale applicaties
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces met externe systemen
 MenuHandlers=Menuverwerkers
 MenuAdmin=Menu wijzigen
@@ -463,9 +463,9 @@ ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br> Voor het formulier om een ​​nieuwe relatie te maken, is dit <strong> %s </strong>. <br> Als u alleen de standaardwaarde wilt als url een bepaalde parameter heeft, kunt u<strong>%s</strong>gebruiken
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Schakel het gebruik van gepersonaliseerde standaardwaarden in
 EnableOverwriteTranslation=Schakel het gebruik van de overschreven vertaling in
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Gebruikers & groepen
 Module0Desc=Groepenbeheer gebruikers/werknemers
 Module1Name=Relaties
-Module1Desc=Beheer van derde partijen (klanten, leveranciers en contactpersonen). Ook kunt u hier sjabloondocumenten uploaden.
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercieel
 Module2Desc=Commercieel beheer
 Module10Name=Boekhouding
@@ -501,7 +501,7 @@ Module23Desc=Monitoring van het verbruik van energie
 Module25Name=Bestellingen klanten
 Module25Desc=Beheer van de bestellingen door klanten
 Module30Name=Facturen
-Module30Desc=Factuur- en creditnotabeheer voor klanten. Factuurbeheer voor leveranciers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Leveranciers
 Module40Desc=Leveranciers- en inkoopbeheer (inkooporders en facturering)
 Module42Name=Debug logs
@@ -902,7 +902,7 @@ DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Betalingsvoorwaarden
 DictionaryPaymentModes=Betaalwijzen
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Papierformaten
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Lokale Belastingen rapporten zijn het totaal van belastingen v
 LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan worden gevonden voor de code
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
 CurrentNext=Huidige/volgende
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Veiligheidsauditgebeurtenissen
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Over Dolibarr
 InfoBrowser=About Browser
 InfoOS=Over OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser naam
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
 SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd
-LogEventDesc=Hier kunt u de de gewenste veiligheidslogs in- of uitschakelen. Beheerders kunnen de inhoud ervan dan zien via het menu <b>Home->Systeemwerkset->Audit.</b> Waarschuwing, deze functionaliteit kan een grote hoeveelheid gegevens in de database wegschrijven.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</b> worden ingesteld
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit scherm is alleen beschikbaar voor de beheerders. Andere Dolibarr gebruikers kunnen hier niets wijzigen.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Stap van afronding (voor landen waar de afronding gebeurd
 UnitPriceOfProduct=Prijs per eenheid van een product
 TotalPriceAfterRounding=Totale prijs inclusief na afronding
 ParameterActiveForNextInputOnly=De instelling word pas actief voor de volgende invoer
-NoEventOrNoAuditSetup=Geen geregistreerde auditgebeurtenis. Dit is normaal als de audit nog niet is ingeschakeld in "Home->Instellingen->Beveiliging->Audit".
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Controleer de instellingen van uw lokale "sendmail"-programma
 BackupDesc=Om een complete backup van Dolibarr te maken, dient u:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementaire attributen (orderregels)
 ExtraFieldsSupplierInvoicesLines=Complementaire attributen (factuurregels)
 ExtraFieldsThirdParties=Aanvullende kenmerken (relaties)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Aanvullende kenmerken (lid)
 ExtraFieldsMemberType=Aanvullende kenmerken (soort lid)
 ExtraFieldsCustomerInvoices=Aanvullende kenmerken (facturen)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Lijst van meldingen per gebruiker*
 ListOfNotificationsPerUserOrContact=Lijst met meldingen per gebruiker * of per contact **
 ListOfFixedNotifications=Lijst met vaste meldingen
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Ga naar het tabblad "Meldingen" bij een relatie om meldingen voor contacten/adressen toe te voegen of te verwijderen
 Threshold=Drempel
 BackupDumpWizard=Wizard om database backup dump bestand op te bouwen
 SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Resource Module configureren
 UseSearchToSelectResource=Gebruik een zoekformulier om een ​​resource te kiezen (in plaats van een vervolgkeuzelijst).
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 63f8bea5ec0..d6f6d0d6ef3 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -76,8 +76,8 @@ TransactionsToConciliate=Items af te stemmen
 Conciliable=Kunnen worden afgestemd
 Conciliate=Afstemmen
 Conciliation=Afstemming
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Afschrift alleen opslaan
+ReconciliationLate=Later afstemmen
 IncludeClosedAccount=Inclusief opgeheven rekeningen
 OnlyOpenedAccount=Alleen open accounts
 AccountToCredit=Te crediteren rekening
@@ -117,7 +117,7 @@ ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwi
 BankChecks=Bankcheque
 BankChecksToReceipt=Cheques in afwachting van storting
 ShowCheckReceipt=Toon controleren stortingsbewijs
-NumberOfCheques=No. of check
+NumberOfCheques=Checknr.
 DeleteTransaction=Ingave verwijderen
 ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
@@ -164,3 +164,5 @@ AddVariousPayment=Voeg verschillende betalingen toe
 SEPAMandate=SEPA-mandaat
 YourSEPAMandate=Uw SEPA-mandaat
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index f87c18385d9..1098fa8684f 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma factuur
 InvoiceProFormaDesc=Een proforma factuur is een voorlopige factuur en een orderbevestiging. Het is geen officiële factuur, maar bedoeld voor afnemers in het buitenland om bijvoorbeeld een vergunning aan te vragen of de inklaring voor te bereiden. Ze worden ook gebruikt voor het aanvragen van een Letter of Credit (L/C).
 InvoiceReplacement=Vervangingsfactuur
 InvoiceReplacementAsk=Vervangingsfactuur voor factuur
-InvoiceReplacementDesc=<b>Vervanging factuur</b> wordt gebruikt om een onbetaalde factuur te annuleren en te vervangen. <br><br> Opmerking: Alleen facturen zonder betaling kunne worden vervangen. Als de factuur die u vervangt nog niet gesloten is, wordt deze automatisch gesloten voor 'verlaten'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Creditnota
 InvoiceAvoirAsk=Creditnota te corrigeren factuur
-InvoiceAvoirDesc=De <b>creditnota</b> is een negatieve factuur die gebruikt wordt wanneer op een factuur het bedrag verschilt van het werkelijk betaalde bedrag (bijvoorbeeld omdat door de afnemer per abuis te veel is betaald of een aantal producten zijn geretouneerd).<br><br>Opmerking: de originele factuur moet worden gesloten (en geclassificeerd als zijnde 'betaald' of 'gedeeltelijk betaald') om een creditnota te kunnen aanmaken.
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Maak Credit Nota met lijnen van de oorsprongkelijke factuur
 invoiceAvoirWithPaymentRestAmount=Maak Creditnota van resterend onbetaald bedrag van herkomst factuur
 invoiceAvoirLineWithPaymentRestAmount=Credit Nota voor de resterende openstaande bedrag
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=Factuur valuta
 PaidBack=Terugbetaald
 DeletePayment=Betaling verwijderen
 ConfirmDeletePayment=Weet u zeker dat u deze betaling wilt verwijderen?
-ConfirmConvertToReduc=Will u deze %s converteren naar een absolute korting?<br>Het bedrag zal worden verspreid over alle kortingen en kan worden gebruikt als een korting voor een bestaande of toekomstige factuur voor deze klant.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Leveranciersbetalingen
 ReceivedPayments=Ontvangen betalingen
 ReceivedCustomersPayments=Ontvangen betalingen van afnemers
-PayedSuppliersPayments=Betaald aan leverancier
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Te valideren ontvangen afnemersbetalingen
 PaymentsReportsForYear=Betalingsverslagen voor %s
 PaymentsReports=Betalingsverslagen
@@ -91,8 +91,8 @@ PaymentConditionsShort=Betalingsvoorwaarden
 PaymentAmount=Betalingsbedrag
 ValidatePayment=Valideer deze betaling
 PaymentHigherThanReminderToPay=Betaling hoger dan herinnering te betalen
-HelpPaymentHigherThanReminderToPay=Pas op, het bedrag van een of meerdere betalingen is hoger is dan de uitstaande factuur. <br> Corrigeer uw invoer, of anders bevestigen en na denken over het verlenen van een krediet van te veel betaald bij het afsluiten van elke betaalde factuur.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klassificeer 'betaald'
 ClassifyPaidPartially=Classificeer 'gedeeltelijk betaald'
 ClassifyCanceled=Classificeer 'verlaten'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Gesloten (onbetaald)
 BillStatusClosedPaidPartially=Betaald (gedeeltelijk)
 BillShortStatusDraft=Concept
 BillShortStatusPaid=Betaald
-BillShortStatusPaidBackOrConverted=Teruggestort of omgezet
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Betaald
 BillShortStatusCanceled=Verlaten
 BillShortStatusValidated=Gevalideerd
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Niet terugbetaald
 BillShortStatusClosedUnpaid=Gesloten
 BillShortStatusClosedPaidPartially=Betaald (gedeeltelijk)
 PaymentStatusToValidShort=Te valideren
-ErrorVATIntraNotConfigured=BTW-nummer vooriIntracommunautaire transacties, nog niet vastgesteld.
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Geen standaardbetaalwijze ingesteld. Ga naar de instellingen van de factuurmodule (Home->Instellingen->Modules), om dit op te lossen.
 ErrorCreateBankAccount=Creëer een bankrekening, daarna gaat u naar de Instellingen van de factuurmodule om de betaalmogelijkheden te definiëren
 ErrorBillNotFound=Factuur %s bestaat niet
-ErrorInvoiceAlreadyReplaced=Fout, u probeert een factuur die factuur %s moet vervangen te valideren, maar deze is al vervangen door factuur %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Fout, korting al gebruikt
 ErrorInvoiceAvoirMustBeNegative=Fout, correcte factuur moet een negatief bedrag hebben
 ErrorInvoiceOfThisTypeMustBePositive=Fout, dit soort facturen moet een positief bedrag hebben
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan een factuur niet annuleren die is vervangen door een ander factuur als deze nog in conceptstatus is
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Van
 BillTo=Geadresseerd aan
 ActionsOnBill=Acties op factuur
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Weet u zeker dat u de status van factuur <b> %s </b> wil
 ConfirmCancelBill=Weet u zeker dat u factuur <b> %s </b> wilt annuleren?
 ConfirmCancelBillQuestion=Wilt u deze factuur classificeren als 'verlaten'?
 ConfirmClassifyPaidPartially=Weet u zeker dat u de status van factuur <b> %s </b> wilt wijzigen naar betaald?
-ConfirmClassifyPaidPartiallyQuestion=Deze factuur is niet volledig betaald. Wat zijn de redenen om deze factuur te sluiten?
-ConfirmClassifyPaidPartiallyReasonAvoir=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd gedaan vóór de termijn. Ik regulariseer de BTW met een creditnota.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik accepteer de BTW te verliezen op deze korting.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik vorder de BTW terug van deze korting, zonder een credit nota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slechte afnemer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Producten gedeeltelijk teruggegeven
 ConfirmClassifyPaidPartiallyReasonOther=Claim verlaten om andere redenen
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Deze keuze is mogelijk als uw factuur werd gelabeld met de juiste woorden. (Voorbeeld: "Alleen de belasting die hoort bij de prijs die echt betaald is geeft recht op aftrek")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In sommige landen zou deze keuze alleen kunnen als uw factuur de juiste notitie bevat.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Maak deze keuze als alle andere keuzes niet passend zijn
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Een <b>slechte afnemer</b> is een afnemer die weigert zijn schulden te betalen.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Deze keuze wordt gebruikt wanneer er geen complete betaling is ontvangen, omdat sommige van de producten zijn geretourneerd
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Maak deze keuze als alle andere keuzes niet passend zijn, bijvoorbeeld in de volgende gevallen: <br> - gedeeltelijke betaling omdat een aantal producten geretourneerd zijn<br>- Afnemer te belangrijk: na het vergeten van een korting <br> In alle gevallen moet het teveel in rekening gebrachte aangepast worden door aan de afnemer een credit factuur te sturen.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Andere
 ConfirmClassifyAbandonReasonOtherDesc=Deze keuze zal in alle andere gevallen worden gebruikt. Bijvoorbeeld omdat u van plan bent om de factuur te vervangen.
 ConfirmCustomerPayment=Bevestigt u deze betaling voor <b> %s </b> %s ?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Bevestigd u deze betaling voor <b> %s </b> %s ?
 ConfirmValidatePayment=Weet u zeker dat u deze betaling wilt valideren? Na validatie kunnen er geen wijzigingen meer worden gemaakt.
 ValidateBill=Valideer factuur
 UnvalidateBill=Unvalidate factuur
-NumberOfBills=Aantal facturen
-NumberOfBillsByMonth=Aantal facturen per maand
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Bedrag van de facturen
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Aantal facturen per maand (BTW)
 ShowSocialContribution=Toon sociale/fiscale belasting
 ShowBill=Toon factuur
@@ -260,9 +262,9 @@ Repeatables=Sjablonen
 ChangeIntoRepeatableInvoice=Omzetten in sjabloon factuur
 CreateRepeatableInvoice=Maak sjabloon factuur
 CreateFromRepeatableInvoice=Maak van sjabloon factuur
-CustomersInvoicesAndInvoiceLines=Afnemersfacturen en factuurregels
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Afnemersfacturen en betalingen
-ExportDataset_invoice_1=Afnemersfacturen en factuurregels
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Afnemersfacturen en -betalingen
 ProformaBill=Proforma factuur:
 Reduction=Vermindering
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Kortingen of tegoeden reeds verbruikt
 CustomerDiscounts=Klantkorting
 SupplierDiscounts=Leverancierskortingen
 BillAddress=Factuuradres
-HelpEscompte=Deze korting wordt toegekend aan de afnemer omdat de betaling werd gemaakt ruim voor de termijn.
-HelpAbandonBadCustomer=Dit bedrag is verlaten (afnemer beschouwt als slechte betaler) en wordt beschouwd als een buitengewoon verlies.
-HelpAbandonOther=Dit bedrag is verlaten, omdat het een fout was (verkeerde afnemer of factuur vervangen door een andere bijvoorbeeld)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Toon betalings id sociale/fiscale belasting
 PaymentId=Betalings id
 PaymentRef=Betalingsreferentie
@@ -321,22 +323,22 @@ InvoiceNotChecked=Geen factuur geselecteerd
 CloneInvoice=Kloon factuur
 ConfirmCloneInvoice=Weet u zeker dat u factuur <b> %s </b> wilt klonen?
 DisabledBecauseReplacedInvoice=Actie uitgeschakeld omdat factuur is vervangen
-DescTaxAndDividendsArea=Dit gedeelte geeft een opsomming weer van alle speciale betalingen. Alleen regels met betalingen in dit jaar worden weergegeven
-NbOfPayments=Aantal betalingen
+DescTaxAndDividendsArea=Dit gebied geeft een overzicht van alle betalingen voor speciale uitgaven. Alleen records met de betaling gedurende het kalender jaar zijn hier opgenomen.
+NbOfPayments=No. of payments
 SplitDiscount=Splits korting in twee
-ConfirmSplitDiscount=Weet u zeker dat u deze korting <b> %s </b> %s wilt splitsen in 2 lagere kortingen?
-TypeAmountOfEachNewDiscount=Voer het bedrag voor elk van de twee delen in:
-TotalOfTwoDiscountMustEqualsOriginal=Totaal van de twee nieuwe korting moet gelijk zijn aan het originele kortingsbedrag.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Weet u zeker dat u deze korting wilt verwijderen?
 RelatedBill=Gerelateerde factuur
 RelatedBills=Gerelateerde facturen
 RelatedCustomerInvoices=Verwante klantenfacturen
 RelatedSupplierInvoices=Verwante leveranciersfacturen
 LatestRelatedBill=Laatste gerelateerde factuur
-WarningBillExist=Waarschuwing één of meer facturen bestaan reeds 
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Samenvoeging PDF-tool
 AmountPaymentDistributedOnInvoice=Te betalen bedrag verdeeld over de factuur
-PaymentOnDifferentThirdBills=Betalingen toestaan van verschillende derden met hetzelfde moeder bedrijf
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Betalingsopmerking
 ListOfPreviousSituationInvoices=Lijst van vorige situatie facturen
 ListOfNextSituationInvoices=Lijst van volgende situatie facturen
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 PaymentTypeTIP=TIP (Documenten tegen betaling)
 PaymentTypeShortTIP=Betaling fooi
-PaymentTypeVAD=Internetbetaling
-PaymentTypeShortVAD=Internetbetaling
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bankcheque
 PaymentTypeShortTRA=Ontwerp
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bankgegevens
 BankCode=Bankcode
-DeskCode=Bankcode
+DeskCode=Office code
 BankAccountNumber=Rekeningnummer
-BankAccountNumberKey=Sleutel
+BankAccountNumberKey=Check digits
 Residence=Incasso
-IBANNumber=IBAN-nummer
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT-nummer
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Betaling via overschrijving op de volgende ba
 VATIsNotUsedForInvoice=* BTW niet van toepassing
 LawApplicationPart1=Door toepassing van burgerwetboek
 LawApplicationPart2=blijven de goederen eigendom van
-LawApplicationPart3=de verkoper tot de volledige betaling van
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=de rekening.
 LimitedLiabilityCompanyCapital=Vennootschap met een kapitaal van
 UseLine=Toepassen
@@ -463,7 +465,7 @@ Cheques=Cheques
 DepositId=ID storting
 NbCheque=Aantal cheques
 CreditNoteConvertedIntoDiscount=Deze %s is geconverteerd naar %s
-UsBillingContactAsIncoiveRecipientIfExist=Gebruik afnemersfacturatiecontactadres in plaats van derde adres als ontvanger voor de facturen
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Bekijk alle onbetaalde
 ShowUnpaidLateOnly=Toon alleen onbetaalde te late facturen
 PaymentInvoiceRef=Betaling factuur %s
@@ -474,21 +476,22 @@ Reported=Uitgestelde
 DisabledBecausePayments=Niet beschikbaar omdat er betalingen bestaan
 CantRemovePaymentWithOneInvoicePaid=Verwijder onmogelijk wanneer er minstens een factuur betaald is ingedeeld.
 ExpectedToPay=Verwachte betaling
-CantRemoveConciliatedPayment=Kan een afgestemde betaling niet verwijderen
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Betaald door deze betaling
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classeer terugbetaalde creditnotas automatisch naar status &quot;Betaald&quot;.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Alle betaalde facturen zullen automatisch worden gesloten naar status &quot;Betaald&quot;.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Betaal
 ToMakePaymentBack=Terugbetalen
 ListOfYourUnpaidInvoices=Lijst van onbetaalde facturen
 NoteListOfYourUnpaidInvoices=Nota: deze lijst bevat enkel facturen voor derde partijen waarvoor je als verkoopsvertegenwoordiger aangegeven bent.
 RevenueStamp=Taxzegel
-YouMustCreateInvoiceFromThird=Deze optie is alleen beschikbaar bij het maken van een factuur vanuit het tabblad 'Klanten" van derden
-YouMustCreateInvoiceFromSupplierThird=Deze optie is alleen beschikbaar bij het maken van een factuur vanuit het tabblad  'Leverancier" van derden
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en converteer naar een sjabloon om deze als sjabloon te gebruiken
 PDFCrabeDescription=Model van complete factuur (Beheert de mogelijkheid van de BTW-heffingsbelasting, de keuze van de regels display, logo, etc)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Factuur PDF-sjabloon 'Crevette'. Een compleet sjabloon voor facturen
 TerreNumRefModelDesc1=Geeft een getal in de vorm van %syymm-nnnn voor standaard facturen en %syymm-nnnn voor creditnota's, met yy voor jaar, mm voor maand en nnnn als opeenvolgende getallenreeks die niet terug op 0 komt
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Factuurregel voortgang mag niet groter zijn dan of geli
 updatePriceNextInvoiceErrorUpdateline=Fout: verander de prijs op regel %s
 ToCreateARecurringInvoice=Als u een herhaal factuur voor dit contract wilt maken, maakt u deze eerst aan in concept en converteert u deze naar een template. Tevens definieert u de frequentie voor het genereren van toekomstige facturen.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Verwijder tijdelijke factuur
 ConfirmDeleteRepeatableInvoice=Weet u zeker dat u dit sjabloon factuur wilt verwijderen?
 CreateOneBillByThird=Orders samentrekken tot één factuur aan per relatie (anders voor elke bestelling één factuur)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Vanaf datum
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Tot datum
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Factuur verwijderd
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 8d6d3af71ee..45001f83b55 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Bedrijfsgegevens
 ShowStock=Tonen magazijn
 DeleteArticle=Klik om dit artikel te verwijderen
 FilterRefOrLabelOrBC=Zoeken (Ref / Label)
-UserNeedPermissionToEditStockToUsePos=U vraagt ​​om de stock te verminderen op factuur creatie, zodat de gebruiker die POS gebruikt rechten moet hebben om stock te bewerke.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Kassabon Printer
+PointOfSale=Punt van de omzet
+PointOfSaleShort=POS
+CloseBill=Rekening sluiten
+Floors=Vloeren
+Floor=Vloer
+AddTable=Tafel toevoegen
+Place=Plaats
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Bestel printers
+SearchProduct=Zoek product
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 572b3950eb7..70fb711c730 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefoongesprek
 ActionAC_FAX=Verzenden per fax
 ActionAC_PROP=Verstuur offerte
 ActionAC_EMAIL=E-mail verzenden
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Vergaderingen
 ActionAC_INT=Interventie op het terrein
 ActionAC_FAC=Stuur factuur
@@ -60,8 +61,8 @@ ActionAC_CLO=Sluiten
 ActionAC_EMAILING=Stuur bulkmail
 ActionAC_COM=Verstuur order per mail
 ActionAC_SHIP=Stuur verzending per post
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Verzend bestelling per e-mail
+ActionAC_SUP_INV=Stuur leveranciers-factuur per e-mail
 ActionAC_OTH=Ander
 ActionAC_OTH_AUTO=Automatisch ingevoegde gebeurtenissen
 ActionAC_MANUAL=Handmatig ingevoerde gebeurtenissen
@@ -72,8 +73,8 @@ StatusProsp=Prospect-status
 DraftPropals=Ontwerp van commerciële voorstellen
 NoLimit=Geen limiet
 ToOfferALinkForOnlineSignature=Link online ondertekenen
-WelcomeOnOnlineSignaturePage=Welkom op deze pagina voor acceptatie prijsopgave/offerte van %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=Dit scherm geeft u de mogelijkheid voor acceptatie en ondertekening van de prijsopgave/offerte
 ThisIsInformationOnDocumentToSign=Informatie om te weigeren of te accepteren
-SignatureProposalRef=Handtekening prijsopgave/offerte %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Online tekenen niet mogelijkheid of document is aangemaakt voordat dit was aangezet
diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang
index 52142faf94e..c17e07f1f24 100644
--- a/htdocs/langs/nl_NL/dict.lang
+++ b/htdocs/langs/nl_NL/dict.lang
@@ -295,7 +295,7 @@ CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=duizend
 #### Input reasons #####
-DemandReasonTypeSRC_INTE=Internetaaa
+DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Mailing campagne
 DemandReasonTypeSRC_CAMP_EMAIL=E-mailen campagne
 DemandReasonTypeSRC_CAMP_PHO=Telefoon campagne
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Mondeling
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Werknemer
 DemandReasonTypeSRC_SPONSORING=Sponsoring
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Grootte 4A0
 PaperFormatEU2A0=Grootte 2A0
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 11cf18b992b..ffb2a65454c 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documenten gekoppeld aan projecten
 ECMDocsByUsers=Documenten gerelateerd met gebruikers
 ECMDocsByInterventions=Documenten gerelateerd aan interventies
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Geen map aangemaakt
 ShowECMSection=Toon map
 DeleteSection=Verwijder map
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index afb87a728e0..f49522795e8 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=Geen globale variabele geselecteerd
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
 WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/help.lang b/htdocs/langs/nl_NL/help.lang
index fa6c66d5a8e..183784843f6 100644
--- a/htdocs/langs/nl_NL/help.lang
+++ b/htdocs/langs/nl_NL/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Directe online ondersteuning en ondersteuning op afstand
 OtherSupport=Andere ondersteuning
 ToSeeListOfAvailableRessources=Om contact op te nemen zie de beschikbare bronnen:
 HelpCenter=Ondersteuningscentrum
-DolibarrHelpCenter=Dolibarr Help- en ondersteuningscentrum
-ToGoBackToDolibarr=Klik anders <a href="%s">hier om Dolibarr te gebruiken</a>
-TypeOfSupport=Ondersteuningsbron
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Gemeenschap (gratis)
 TypeSupportCommercial=Commercieel (betaald)
 TypeOfHelp=Soort
@@ -15,12 +15,9 @@ NeedHelpCenter=Hulp of support nodig?
 Efficiency=Efficiëntie
 TypeHelpOnly=Alleen Hulp
 TypeHelpDev=Hulp & Ontwikkeling
-TypeHelpDevForm=Hulp, ontwikkeling en aanpassingen
-ToGetHelpGoOnSparkAngels1=Sommige bedrijven kunnen snel (soms onmiddellijke) en efficiënt online ondersteuning bieden door middel van overname van uw computer. Dergelijke ondersteuners kunnen gevonden worden op <b>%s</b> website:
-ToGetHelpGoOnSparkAngels3=U kunt ook naar de lijst gaan van alle beschikbare coaches voor Dolibarr, klik hiervoor op de knop
-ToGetHelpGoOnSparkAngels2=Soms is er geen bedrijf te vinden op het moment van uw zoekopdracht, denk er dan aan om het filter te veranderen om te zoeken naar "alle beschikbare hulp". U kunt dan meer verzoeken versturen.
-BackToHelpCenter=Klik anders hier om <a href="%s"> terug te gaan naar de hoofdpagina van het ondersteuningscentrum.</a>
-LinkToGoldMember=U kunt een van de, vooraf door Dolibarr geselecteerde, coaches voor uw taal bellen (%s) door te klikken op zijn Widget (status en de maximale prijs worden automatisch bijgewerkt):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Ondersteunde talen
-SubscribeToFoundation=Help het Dolibarr project, wordt lid van de stichting
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Voor officiële Dolibarr ondersteuning in uw taal: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index 75c00750255..863a1357368 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Verlof
-CPTitreMenu=Verlof
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Maandoverzicht
 MenuAddCP=Nieuw verlofverzoek
-NotActiveModCP=U moet de module 'Beheer van verlofverzoeken' aanzetten om deze pagina te kunnen bekijken.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Aanmaken verlofverzoek
 DateDebCP=Begindatum
 DateFinCP=Einddatum
@@ -15,18 +15,18 @@ ApprovedCP=Goedgekeurd
 CancelCP=Geannuleerd
 RefuseCP=Geweigerd
 ValidatorCP=Gevolmachtigde voor goedkeuring
-ListeCP=Lijst verlofverzoeken
-LeaveId=Leave ID
+ListeCP=List of leave
+LeaveId=Laat ID achter
 ReviewedByCP=Zal worden goedgekeurd door
 UserForApprovalID=User for approval ID
-UserForApprovalFirstname=Firstname of approval user
-UserForApprovalLastname=Lastname of approval user
-UserForApprovalLogin=Login of approval user
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login van goedkeuring gebruiker
 DescCP=Beschrijving
 SendRequestCP=Aanmaken verlofverzoek
 DelayToRequestCP=Verlofverzoeken moeten tenminste <b>%s dag </b> van te voren worden ingediend.
-MenuConfCP=Saldo verlofverzoeken
-SoldeCPUser=Aantal resterende verlofdagen <b>%s</b>
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=U moet een einddatum kiezen die na de startdatum ligt.
 ErrorSQLCreateCP=Er is een SQL fout ontstaan bij het aanmaken:
 ErrorIDFicheCP=Fout. Verlofverzoek bestaat niet.
@@ -101,8 +101,8 @@ LEAVE_SICK=Ziekteverlof
 LEAVE_OTHER=Overig verlof
 LEAVE_PAID_FR=Betaalde vakantie
 ## Configuration du Module ##
-LastUpdateCP=Laatste automatische update van verlofverzoek bestemmingen
-MonthOfLastMonthlyUpdate=Laatste maand van automatische verlofverzoek toewijzingen
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Bijgewerkt.
 Module27130Name= Beheer verlofverzoeken
 Module27130Desc= Beheer verlofverzoeken
@@ -112,7 +112,7 @@ NoticePeriod=Opzegtermijn
 HolidaysToValidate=Verlofverzoeken goedkeuren
 HolidaysToValidateBody=Hieronder verzoek voor goedkeuring
 HolidaysToValidateDelay=Dit verlofverzoek zal plaatsvinden in minder dan %s dag.
-HolidaysToValidateAlertSolde=De aanvrager voor dit verzoek heeft geen voldoende beschikbare verlofdagen over.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Goedkeuren verlofverzoeken
 HolidaysValidatedBody=Uw verlofverzoek van %s tot %s is goedgekeurd.
 HolidaysRefused=Verlofverzoeken geweigerd
@@ -121,4 +121,9 @@ HolidaysCanceled=Annuleren verlofverzoek
 HolidaysCanceledBody=Uw verlofverzoek van%s tot %s is geannuleerd.
 FollowedByACounter=1: Dit soort verlof moet worden vervolgd met een teller. Deze zal handmatig of automatisch worden opgehoogd en wanneer verlofverzoek is goedgekeurd, zal deze automatisch aftellen. <br>0: Niet worden vervolgd met teller
 NoLeaveWithCounterDefined=Er zijn geen soorten verlof waarbij een teller nodig is.
-GoIntoDictionaryHolidayTypes=Ga naar <strong>Home-Instellingen-Woordenboeken-Soort verlofzoeken</strong> voor het opzetten van verschillende soorten verlofverzoeken.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 224665d907e..8c51917ffbf 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Volg simpelweg stap voor stap de instructies
 MiscellaneousChecks=Vereisten controleren
 ConfFileExists=Configuratiebestand <b>%s</b> bestaat.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuratiebestand <b>%s</b> bestaat niet en kon ook niet worden gecreëerd !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuratiebestand <b>%s</b> kon worden gecreëerd.
-ConfFileIsNotWritable=Configuratie bestand <b>%s</b> is niet voor schrijven te openen. Voor de eerste installatie, moet de webserver toestemming krijgen om naar dit bestand te schrijven tijdens het configuratieproces (door bijvoorbeeld "chmod 666" op een Unix-achtig OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuratiebestand <b>%s</b> kan voor schrijven geopend worden.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload alle informatie van configuratiebestand.
+ConfFileMustBeAFileNotADir=Configuratiebestand <b>%s</b> moet een bestand zijn en geen map.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Deze PHP installatie ondersteund sessies.
 PHPSupportPOSTGETOk=Deze PHP installatie ondersteunt POST en GET.
-PHPSupportPOSTGETKo=Mogelijk ondersteunt uw PHP installatie geen POST en / of GET variabelen. Controleer deze instelling <b>variables_order</b> in php.ini.
-PHPSupportGD=Deze PHP installatie ondersteunt GD grafische functies.
-PHPSupportCurl=PHP ondersteunt Curl.
-PHPSupportUTF8=Deze PHP installatie ondersteunt UTF8 functies.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op <b>%s</b>. Dit zou genoeg moeten zijn.
-PHPMemoryTooLow=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op <b>%s</b> bytes. Dit zou te weinig kunnen zijn. Verander uw <b>php.ini</b> om de <b>memory_limit</b> instelling op minimaal <b>%s</b> bytes te zetten.
-Recheck=Klik hier voor een meer significantere test
-ErrorPHPDoesNotSupportSessions=Uw PHP installatie ondersteunt geen sessies. Dit is vereist voor een goede werking van Dolibarr. Controleer uw PHP instellingen.
-ErrorPHPDoesNotSupportGD=Uw PHP installatie ondersteunt geen grafische functies. Grafieken zullen niet beschikbaar zijn.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Uw PHP versie ondersteunt geen Curl.
-ErrorPHPDoesNotSupportUTF8=Uw PHP installatie ondersteunt geen UTF8 functies. Dolibarr kan daardoor niet goed werken. Los dit op voordat u verder gaat met de installatie van Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=De map %s bestaat niet.
-ErrorGoBackAndCorrectParameters=Ga terug en corrigeer de foutief ingestelde waarden.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=U heeft de parameter '%s' mogelijk verkeerd ingesteld.
 ErrorFailedToCreateDatabase=De database '%s' kon niet worden gecreëerd.
 ErrorFailedToConnectToDatabase=Het is niet gelukt om een verbinding met de database  '%s' te maken.
 ErrorDatabaseVersionTooLow=Database versie (%s) is te oud. Versie %s of hoger is vereist.
 ErrorPHPVersionTooLow=De geïnstalleerde PHP versie is te oud. Versie %s is nodig.
-ErrorConnectedButDatabaseNotFound=De verbinding met de server kon succesvol worden gemaakt, maar de database '%s' is niet gevonden.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' bestaat al.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Wanneer de database niet bestaat, ga dan terug en vink de optie "Creëer database" aan.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Wanneer de database al bestaat, ga dan terug en vink "Creëer database" uit.
-WarningBrowserTooOld=Browser-versie te oud. Upgrade je browser naar een recente versie; Firefox, Chrome of Opera worden warm aanbevolen.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP versie
 License=Gebruikerslicentie
 ConfigurationFile=Configuratiebestand
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Naam of IP-adres van de database server, normaal gesproken 'localhost' wanneer de database gehost wordt op dezelfde webserver
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Databaseserverpoort. Laat dit leeg wanneer u dit niet weet.
 DatabaseServer=Databaseserver
 DatabaseName=Databasenaam
-DatabasePrefix=Database prefix tafel
-AdminLogin=Gebruikersnaam voor Dolibarr database eigenaar.
-PasswordAgain=Voer uw wachtwoord opnieuw in.
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Wachtwoord voor de database eigenaar.
 CreateDatabase=Creëer database
-CreateUser=Creëer eigenaar en geef deze permissies op de database.
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Databaseserver - Superuser toegang (root toegang)
-CheckToCreateDatabase=Vink deze optie aan wanneer de database nog niet bestaat en gecreëerd moet worden.<br>In dit geval, moet u de velden gebruikersnaam en wachtwoord voor het superuser (root) account onderaan deze pagina ook invullen.
-CheckToCreateUser=Schakel het selectievakje in als de database-eigenaar niet bestaat en moet worden gemaakt, of als deze bestaat maar de database niet bestaat en machtigingen moeten worden verleend.<br>In dit geval moet u de login en het wachtwoord kiezen en ook de login / het wachtwoord voor het superuser-account onderaan deze pagina invullen. Als dit selectievakje niet is aangevinkt, moeten de eigenaarsdatabase en de bijbehorende wachtwoorden aanwezig zijn.
-DatabaseRootLoginDescription=Gebruikersnaam van de gebruiker die gemachtigd is om nieuwe databases of gebruikers aan te maken, nutteloos wanneer uw database en gebruiker al bestaan (zoals het geval wanneer u een webhosting provider gebruikt).
-KeepEmptyIfNoPassword=Laat dit veld leeg wanneer de gebruiker geen wachtwoord heeft (vermijd dit)
-SaveConfigurationFile=Waarden opslaan
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=serververbinding
 DatabaseCreation=Creatie van database
 CreateDatabaseObjects=Creatie van databaseobjecten
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Creëer foreign keys en indexes voor tabel %s
 OtherKeysCreation=Creatie van Foreign keys en indexes
 FunctionsCreation=Creatie van functies
 AdminAccountCreation=Creatie van beheerdersaccount
-PleaseTypePassword=Vul een wachtwoord in a.u.b., lege wachtwoorden zijn niet toegestaan !
-PleaseTypeALogin=Typ een gebruikersnaam in !
-PasswordsMismatch=Wachtwoorden komen niet overeen, probeert u het opnieuw !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Einde van de installatie
 SystemIsInstalled=De installatie is voltooid.
 SystemIsUpgraded=Dolibarr is succesvol bijgewerkt.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=U dient Dolibarr naar eigen behoefte in te richten (ui
 AdminLoginCreatedSuccessfuly=Dolibarr beheerdersaccount <b>'%s'</b> succesvol gecreëerd.
 GoToDolibarr=Ga naar Dolibarr.
 GoToSetupArea=Ga naar Dolibarr (instellingsomgeving).
-MigrationNotFinished=De versie van uw database is niet helemaal actueel, daarom moet u de upgrade opnieuw uitvoeren.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Ga opnieuw naar de upgrade pagina.
 WithNoSlashAtTheEnd=Zonder toevoeging van de slash "/" aan het eind
-DirectoryRecommendation=Aanbevolen wordt een map te gebruiken buiten uw webpagina map
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Bestaat al
 DolibarrAdminLogin=Login van de Dolibarr beheerder
-AdminLoginAlreadyExists=Het beheerdersaccount <b>'%s'</b> bestaat al.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Aanmaken Dolibarr administrator account niet geslaagd.
-WarningRemoveInstallDir=Waarschuwing, om veiligheidsredenen, dient u de <b>install</b> map na de installatie of upgrade te verwijderen of maak een bestand genaamd <b>install.lock</b> aan in de Dolibarr root map.
-FunctionNotAvailableInThisPHP=Niet beschikbaar in deze PHP installatie
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Kies het migratiescript
 DataMigration=Database migratie (gegevens)
-DatabaseMigration=Database migration (structure + some data)
+DatabaseMigration=Databasemigratie (structuur + enkele gegevens)
 ProcessMigrateScript=Script verwerking
 ChooseYourSetupMode=Kies de gewenste installatiemethode en klik op "Start"...
 FreshInstall=Nieuwe installatie
-FreshInstallDesc=Kies deze optie wanneer dit de eerste keer is dat u Dolibarr installeert of wanneer u een voorgaande incomplete installatie wilt repareren. Wanneer u uw versie wilt bijwerken, kiest u dan voor de optie "Upgrade".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Gebruik deze optie wanneer u oude Dolibarr bestanden wilt vervangen met bestanden van een nieuwe versie. Dit zal uw database en bestanden bijwerken.
 Start=Start
 InstallNotAllowed=Installatie niet toegestaan door beperkte <b>conf.php</b> rechten
 YouMustCreateWithPermission=U dient het bestand %s te creëren en het schrijfrechten te geven voor de webserver tijdens de installatie.
-CorrectProblemAndReloadPage=Verhelp a.u.b. het probleem en druk op F5 om de pagina te herladen.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Al gemigreerd
 DatabaseVersion=Database versie
 ServerVersion=Database server versie
 YouMustCreateItAndAllowServerToWrite=U dient deze map te creëren en de juiste rechten te geven, zodat de webserver erin kan opslaan.
 DBSortingCollation=Karakter sorteervolgorde
-YouAskDatabaseCreationSoDolibarrNeedToConnect=U wilt de database <b>%s,</b> creëren, maar hiervoor moet Dolibarr met de server <b>%s</b> verbinden met superuser (root) <b>%s</b> rechten.
-YouAskLoginCreationSoDolibarrNeedToConnect=U wilt de database gebruikersnaam <b>%s,</b> creëren, maar hiervoor moet Dolibarr met de server <b>%s</b> verbinden met superuser (root) <b>%s</b> rechten.
-BecauseConnectionFailedParametersMayBeWrong=Omdat de verbinding niet geslaagd is, moeten de opgegeven host of superuser (root) waarden wel foutief zijn
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Wezenbetaling gedetecteerd door de methode %s
 RemoveItManuallyAndPressF5ToContinue=Verwijder het met de hand en druk op F5 om door te gaan
 FieldRenamed=Veld hernoemd
-IfLoginDoesNotExistsCheckCreateUser=Wanneer de gebruiker nog niet bestaat, dient u de optie "Gebruiker aanmaken" aan te vinken
-ErrorConnection=Server <b>"%s",</b> databasenaam <b>"%s",</b> gebruikersnaam <b>"%s",</b> of databasewachtwoord kunnen foutief zijn ingesteld of de geïnstalleerde PHP versie is te oud vergeleken met de database versie.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Aanbevolen keuze om versie <b>%s</b> te installeren vanaf uw huidige versie <b>%s</b>
 InstallChoiceSuggested=<b>Installatiemethode voorgesteld door het installatieprogramma.</b>
-MigrateIsDoneStepByStep=De beoogde versie (%s) heeft een gat van meerdere versies, zodat installatie wizard zal terug komen naar de volgende migratie stellen zodra dit een zal worden afgewerkt.
-CheckThatDatabasenameIsCorrect=Controleer of de databasenaam <b>%s</b> juist is.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Als deze naam correct is en deze database nog niet bestaat, dient u de optie "Creëer database" aan te vinken.
 OpenBaseDir=PHP openbasedir waarde
-YouAskToCreateDatabaseSoRootRequired=U heeft de optie "Creëer database" aangevinkt. Hiervoor dient u de gebruikersnaam en het wachtwoord van de superuser (root) op te geven. (Onderaan het formulier).
-YouAskToCreateDatabaseUserSoRootRequired=U heeft de optie "Creëer database-eigenaar" aangevinkt. Hiervoor dient u de gebruikersnaam en het wachtwoord van de superuser (root) op te geven. (Onderaan het formulier).
-NextStepMightLastALongTime=Deze stap kan enkele minuten duren. Wacht a.u.b. tot het volgende scherm wordt weergegeven voordat u verdergaat.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migreer afnemersopdrachtverzending
 MigrationShippingDelivery=Waardeer de opslag van verzending op
 MigrationShippingDelivery2=Waardeer de opslag van verzending op 2
 MigrationFinished=Migratie voltooid
-LastStepDesc=<strong>Laatste stap:</strong> Definieer hier de login en het wachtwoord die u wilt gebruiken om verbinding te maken met de software. Raak deze gegevens niet kwijt omdat dit account bedoelt is om alle andere gebruikers te beheren.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activeer module %s
 ShowEditTechnicalParameters=Klik hier om geavanceerde parameters te zien of te wijzigen. (expert instellingen)
-WarningUpgrade=Waarschuwing:\nHeeft u eerst een database back-up gemaakt?\nDit wordt ten zeerste aanbevolen. Bijvoorbeeld door bugs in databasesystemen (bijvoorbeeld in MySQL versie 5.5.40 / 41/42/43), kunnen sommige gegevens of tabellen tijdens dit proces verloren gaan, dus het wordt sterk aanbevolen om een complete dump van uw database te maken voordat u met de migratie begint.\n\nKlik op OK om het migratieproces te starten ...
-ErrorDatabaseVersionForbiddenForMigration=Uw database versie is %s en heeft een kritieke bug die gegevensverlies veroorzaakt als u structuur veranderingen uitvoert op uw database, welke gedaan worden door het migratieproces. Vanwege deze reden, zal de migratie niet worden toegestaan ​​totdat u uw database upgrade naar een hogere versie (lijst van gekende versies met bug: %s).
-KeepDefaultValuesWamp=U gebruikt de Dolibarr installatiewizard van DoliWamp, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Wijzig ze alleen wanneer u weet wat u doet.
-KeepDefaultValuesDeb=U gebruikt de Dolibarr installatiewizard uit een Ubuntu of Debian pakket, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Alleen het wachtwoord van de te creëren database-eigenaar moeten worden ingevuld. Wijzig de andere waarden alleen als u weet wat u doet.
-KeepDefaultValuesMamp=U gebruikt de Dolibarr installatiewizard van DoliMamp, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Wijzig ze alleen wanneer u weet wat u doet.
-KeepDefaultValuesProxmox=U gebruikt de Dolibarr installatiewizard van een Proxmox virtueel systeem, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Wijzig ze alleen wanneer u weet wat u doet.
-UpgradeExternalModule=Voer een specifiek upgradeproces uit voor externe modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Stel ten minste één optie in als parameter in de URL. Bijvoorbeeld: '... repair.php? Standard = confirmed'
 NothingToDelete=Niets om op te ruimen / verwijderen
 NothingToDo=Niets te doen
@@ -147,11 +148,11 @@ NothingToDo=Niets te doen
 # upgrade
 MigrationFixData=Reparatie voor gedenormaliseerde gegevens
 MigrationOrder=Gegevensmigratie van orders van afnemers
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=Gegevensmigratie voor bestellingen van leveranciers
 MigrationProposal=Gegevensmigratie van zakelijke voorstellen
 MigrationInvoice=Gegevensmigratie van afnemersfacturen
 MigrationContract=Gegevensmigratie van contracten
-MigrationSuccessfullUpdate=Dolibarr is succesvol bijgewerkt.
+MigrationSuccessfullUpdate=Upgrade succesvol
 MigrationUpdateFailed=Het upgrade proces is mislukt
 MigrationRelationshipTables=Gegevensmigratie van de relatietabellen (%s)
 MigrationPaymentsUpdate=Correctie betalingsgegevens
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Correctie contractgegevens
 MigrationContractsNumberToUpdate=%s contract(en) bij te werken
 MigrationContractsLineCreation=Creëer contract regel voor contract %s
 MigrationContractsNothingToUpdate=Niets meer te doen
-MigrationContractsFieldDontExist=Het veld fk_facture bestaat niet meer. Niets te doen.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract lege datum correctie
-MigrationContractsEmptyDatesUpdateSuccess=Contract lege datumcorrectie met succes uitgevoerd
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Geen contract lege datum te corrigieren
 MigrationContractsEmptyCreationDatesNothingToUpdate=Geen contract creatiedatum te corrigeren
 MigrationContractsInvalidDatesUpdate=Ongeldige datum contract waarde correctie
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Levering bijwerking
 MigrationStockDetail=Werk waarde van voorraad van producten bij
 MigrationMenusDetail=Werk de tabellen van de dynamische menu's bij
 MigrationDeliveryAddress=Werk afleveringsadres voor verzendingen bij
-MigrationProjectTaskActors=Gegevensmigratie voor llx_projet_task_actors tabel
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Gegevensmigratie veld fk_user_resp van llx_projet naar llx_element_contact
 MigrationProjectTaskTime=Verstreken tijd van de update in seconden
 MigrationActioncommElement=Bijwerken van gegevens over acties
 MigrationPaymentMode=Data migratie voor de betaling mode
 MigrationCategorieAssociation=Migratie van categoriën
-MigrationEvents=Migratie van taken om taak eigenaar toe te voegen in toekennings tabel
-MigrationEventsContact=Migratie van evenementen om afspraakcontact toe te voegen aan de toewijzingstabel
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Aanpassen entity veld waarde van llx_societe_remise
 MigrationRemiseExceptEntity=Aanpassen entity veld waarde van llx_societe_remise_except
 MigrationUserRightsEntity=Aanpassen entity veld waarde van llx_user_rights
 MigrationUserGroupRightsEntity=Aanpassen entity veld waarde van llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Herlaad module %s
 MigrationResetBlockedLog=Reset BlockedLog module voor v7 algoritme
-ShowNotAvailableOptions=Toon niet beschikbare opties
-HideNotAvailableOptions=Verberg niet beschikbare opties
-ErrorFoundDuringMigration=Er is een fout gemeld tijdens het migratieproces, dus de volgende stap is niet beschikbaar. Om fouten te negeren kunt u <a href="%s">hier</a> klikken, maar sommige functies van de applicatie werken mogelijk pas goed als deze zijn opgelost.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Klik hier om naar uw toepassing te gaan
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index f1d59268b82..cbd0a5139a1 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Bedrijfscontacten
 ContactsAddressesForCompany=Contacten / adressen voor deze relatie
 AddressesForCompany=Adressen voor deze relatie
 ActionsOnCompany=Acties voor bedrijf
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events over dit lid
 ActionsOnProduct=Evenementen in dit product
 NActionsLate=%s is laat
@@ -849,7 +850,7 @@ BulkActions=Bulkacties
 ClickToShowHelp=Klik om tooltip-help weer te geven
 WebSite=Website
 WebSites=Websites
-WebSiteAccounts=Websiteaccounts
+WebSiteAccounts=Website accounts
 ExpenseReport=Rapportage kosten
 ExpenseReports=Onkostennota's 
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Bestand gedeeld via een link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=U bent momenteel in de %s "sandbox" -modus
+Inventory=Inventarisering
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 3538c25c87e..6f5ba9fb0e6 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Gekoppeld object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Installatie van module website
 WEBSITE_PAGEURL=URL van pagina
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Omschrijving
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Sleutelwoorden
 LinesToImport=Regels om te importeren
diff --git a/htdocs/langs/nl_NL/paybox.lang b/htdocs/langs/nl_NL/paybox.lang
index 489158a2dda..0eb9a3ba58c 100644
--- a/htdocs/langs/nl_NL/paybox.lang
+++ b/htdocs/langs/nl_NL/paybox.lang
@@ -20,6 +20,7 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL om een %s online betalingsgebruikersin
 ToOfferALinkForOnlinePaymentOnContractLine=URL om een %s online betalingsgebruikersinterface aan te bieden voor een contractregel
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL om een %s online betalingsgebruikersinterface aan te bieden voor een donatie
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL om een %s online betalingsgebruikersinterface aan te bieden voor een ledenabonnement
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=U kunt ook een URL (GET) parameter <b>&tag=<i>waarde</i></b> toevoegen aan elk van deze URL's (enkel nodig voor een donatie) om deze van uw eigen betalingscommentaar te voorzien
 SetupPayBoxToHavePaymentCreatedAutomatically=Stel uw Paybox in met url <b> %s </b> om de betaling automatisch te laten aanmaken na validatie door Paybox.
 YourPaymentHasBeenRecorded=Deze pagina bevestigd dat uw betaling succesvol in geregistreerd. Dank u.
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index fc3b8010737..e0e9e05a3eb 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -55,7 +55,7 @@ NoDraftProposals=Geen ontwerpoffertes
 CopyPropalFrom=Maak offerte door het kopiëren van een bestaande offerte
 CreateEmptyPropal=Maak een leeg commercieel voorstel of uit een lijst met producten / services
 DefaultProposalDurationValidity=Standaardgeldigheid offerte (in dagen)
-UseCustomerContactAsPropalRecipientIfExist=Gebruik,  indien ingesteld, het afnemerscontactadres als offerteontvangstadres in plaats van het adres van de Klant
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Kloon offerte
 ConfirmClonePropal=Weet u zeker dat u offerte <b>%s</b>  wilt kopiëren?
 ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> wilt her-openen?
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index bcfb2ff8579..0dffc01b547 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -1,44 +1,46 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Website verwijderen
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Soort pagina / container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_PAGE_EXAMPLE=Webpagina om als voorbeeld te gebruiken
+WEBSITE_PAGENAME=Paginanaam/alias
+WEBSITE_ALIASALT=Alternatieve paginanamen/aliassen
 WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_CSS_URL=URL van extern CSS-bestand
+WEBSITE_CSS_INLINE=CSS-bestandsinhoud (gemeenschappelijk voor alle pagina's)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
-HtmlHeaderPage=HTML header (specific to this page only)
+WEBSITE_ROBOT=Robotbestand (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+HtmlHeaderPage=HTML-header (alleen voor deze pagina)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+MediaFiles=Mediatheek
+EditCss=Edit website properties
 EditMenu=Wijzig menu
-EditMedias=Edit medias
-EditPageMeta=Edit Meta
-AddWebsite=Add website
+EditMedias=Bewerk media
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Website toevoegen
 Webpage=Webpagina/container
-AddPage=Add page/container
+AddPage=Voeg pagina/container toe
 HomePage=Startpagina
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Een voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst een pagina toevoegen.
+PageContainer=Pagina/container
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Pagina/Container
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
+PageDeleted=Pagina/Container '%s' van website %s is verwijderd
+PageAdded=Pagina/Container '%s' toegevoegd
+ViewSiteInNewTab=Bekijk de website in een nieuw tabblad
 ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
+SetAsHomePage=Als startpagina instellen
+RealURL=Echte URL
 ViewWebsiteInProduction=Bekijk website met behulp van eigen URL's
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Lezen
 WritePerm=Write
@@ -46,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=Nog geen pagina's
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help bij specifieke syntax-tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br> <span class="fa fa-bug"></span> U kunt PHP-code opnemen in deze bron met behulp van labels <strong> &lt;? php? &gt;</strong>. De volgende globale variabelen zijn beschikbaar: $ conf, $ langs, $ db, $ mysoc, $ user, $ website. <br><br> <span class="fa fa-bug"></span>Je kunt ook inhoud van een andere pagina/container met de volgende syntaxis: <br> <strong> &lt;? php includeContainer ('alias_of_container_to_include'); ? &gt; </strong><br><br><span class="fa fa-bug"></span>U kunt een omleiding naar een andere pagina / container uitvoeren met de volgende syntaxis: <br><strong> &lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ? &gt; </strong><br><br><span class="fa fa-download"></span> Een <strong>-link opnemen om te downloaden</strong> een bestand dat is opgeslagen in de <strong>documenten</strong> map, gebruik de <strong>document.php</strong> wrapper:<br>Voorbeeld, voor een bestand naar documenten / ecm (moet worden gelogd), syntaxis is:<br><strong>&lt;a href = "/document.php?modulepart=ecm&file=[relative_dir/]filename.ext" &gt; </strong><br> Voor een bestand naar documenten / media (open map voor openbare toegang) is de syntaxis: <br><strong>&lt;a href = "/ document.php? modulepart = medias & file = [relative_dir /] bestandsnaam.ext" &gt;</strong> <br> Voor een bestand dat wordt gedeeld met een gedeelde link (open toegang met behulp van de hash-sleutel van bestand delen), syntaxis is: <br> <strong>&lt;a href = "/ document.php? hashp = publicsharekeyoffile" &gt;</strong> <br> <br> <span class="fa fa-picture-o"></span>Naar een <strong>afbeelding</strong> opnemen die is opgeslagen in de map <strong>documenten</strong>, gebruikt u de<strong> viewimage.php</strong> -wrapper: <br> Voorbeeld voor een afbeelding in documenten / media (open toegang), syntaxis is: <br> <strong> &lt;a href = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] bestandsnaam.ext" &gt; </strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Kloon pagina/container
 CloneSite=Klonen site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -74,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -84,3 +88,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 70b6f079a2f..f33d2ade5d0 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funkcja niedostępna w wersji demo
 FeatureAvailableOnlyOnStable=Funkcjonalność dostępna tylko w oficjalnej stabilnej wersji
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Możesz znaleźć więcej modułów do pobrania na zewnętrznych stronach internetowych...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Znajdź dodatkowe aplikacje / moduły
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Narzędzia dla wielu modłułów
 ModuleFamilyExperimental=Eksperymentalne moduły
 ModuleFamilyFinancial=Moduły finansowe (Księgowość)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Strony internetowe i inne czołowa aplikacji
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Współpraca z systemami zewnętrznymi
 MenuHandlers=Menu obsługi
 MenuAdmin=Edytor menu
@@ -463,9 +463,9 @@ ClickToShowDescription=Kliknij aby zobaczyć opis
 DependsOn=This module needs the module(s)
 RequiredBy=Ten moduł wymagany jest przez moduł(y)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Użytkownicy i grupy
 Module0Desc=Zarządzanie Użytkownikami/Pracownikami i Grupami
 Module1Name=Third Parties
-Module1Desc=Zarządzanie firmami oraz kontaktami (klienci, prospekty...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Reklama
 Module2Desc=Zarządzanie reklamą
 Module10Name=Księgowość
@@ -501,7 +501,7 @@ Module23Desc=Monitorowanie zużycia energii
 Module25Name=Zamówienia klientów
 Module25Desc=Zarządzanie zamówieniami klienta
 Module30Name=Faktury
-Module30Desc=Zarządzanie fakturami oraz notami kredytowymi klientów. Zarządzanie fakturami dostawców
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dostawcy
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Stawki VAT lub stawki podatku od sprzedaży
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Warunki płatności
 DictionaryPaymentModes=Tryby płatności
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Podatku ekologicznego (WEEE)
 DictionaryPaperFormat=Formaty papieru
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Lokalne raporty Podatki są za łączną sprzedaży localtaxes
 LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć tłumaczenie dla kodu
 LabelOnDocuments=Etykieta na dokumenty
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Na koniec miesiąca
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Zdarzenia audytu bezpieczeństwa
-Audit=Audyt
+Audit=Security events
 InfoDolibarr=O Dolibarr
 InfoBrowser=O przeglądarce
 InfoOS=O systemie
@@ -1065,7 +1066,7 @@ BrowserName=Nazwa przeglądarki
 BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
 SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone
-LogEventDesc=Można włączyć dziennik Dolibarr bezpieczeństwa imprez tutaj. Administratorzy mogą wtedy zobaczyć jego zawartość za pomocą menu <b>Narzędzia systemowe - Audyt.</b> Ostrzeżenie: Funkcja ta może zużywają duże ilości danych w bazie danych.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z prawami administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=Obszar ten jest dostępny tylko dla użytkowników na prawach administratora. Żadne z uprawnień Dolibarr nie zniesie tego ograniczenia.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Cena netto jednostki produktu
 TotalPriceAfterRounding=Łączna cena (netto / VAT / wraz z podatku) po zaokrągleniu
 ParameterActiveForNextInputOnly=Parametr skuteczne wejście tylko dla najbliższych
-NoEventOrNoAuditSetup=Nr bezpieczeństwa zdarzenie zostało jeszcze zarejestrowane. To może być normalne, jeśli kontrola nie została włączona w "setup - bezpieczeństwo - audytu" strony.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Zobacz lokalnej konfiguracji sendmaila
 BackupDesc=Aby wykonać pełną kopię zapasową Dolibarr, musisz:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=(Linie uzupełniające atrybuty order)
 ExtraFieldsSupplierInvoicesLines=Atrybuty uzupełniające (linie na fakturze)
 ExtraFieldsThirdParties=Atrybuty uzupełniające (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Atrybuty uzupełniające (członek)
 ExtraFieldsMemberType=Atrybuty uzupełniające (typ członkiem)
 ExtraFieldsCustomerInvoices=Atrybuty uzupełniające (faktury)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Lista powiadomień na użytkownika*
 ListOfNotificationsPerUserOrContact=Lista powiadomień na użytkownika* lub na kontakt**
 ListOfFixedNotifications=Lista stałych powiadomień
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Próg
 BackupDumpWizard=Konfigurator wykonywania kopii zapasowej bazy danych
 SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Kod pocztowy
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 2360520a92d..0b14db44f38 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -7,7 +7,7 @@ BankName=Nazwa banku
 FinancialAccount=Konto
 BankAccount=Konto bankowe
 BankAccounts=Konta bankowe
-BankAccountsAndGateways=Konta bankowe / Bramki
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Pokaż konto
 AccountRef=Numer referencyjny rachunku bankowego
 AccountLabel=Etykieta rachunku finansowego
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Konto adres
 BankAccountCountry=Konto kraju
 BankAccountOwner=Nazwa właściciela konta
 BankAccountOwnerAddress=Adres właściciela konta
-RIBControlError=Sprawdza integralność wartości, które się niepowiedziodły. Oznacza to, że informacje o tym numerze konta nie są kompletne lub błędne (sprawdź liczbowe, IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Załóż konto
 NewBankAccount=Nowe konto
 NewFinancialAccount=Nowy rachunek finansowy
@@ -76,6 +76,7 @@ TransactionsToConciliate=Wpisy do zaksięgowania
 Conciliable=Może być rekoncyliowane
 Conciliate=Uzgodnienie sald
 Conciliation=Rekoncyliacja
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Dołącz zamknięte rachunki
 OnlyOpenedAccount=Tylko otwarte konta
@@ -104,7 +105,7 @@ SocialContributionPayment=Płatność za ZUS/podatek
 BankTransfer=Przelew bankowy
 BankTransfers=Przelewy bankowe
 MenuBankInternalTransfer=Przelew wewnętrzny
-TransferDesc=Transfer środków z jednego konta na drugie. Dolibarr zapisze dwa rekordy (Debet na koncie źródłowym i zaliczkę na koncie docelowym. Ta sama kwota (oprócz znaku), etykieta i data będą użyte dla tej transakcji) 
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Czeki bankowe
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Pokaż sprawdzić otrzymania wpłaty
-NumberOfCheques=Nr czeku
+NumberOfCheques=No. of check
 DeleteTransaction=Usuń wpis
 ConfirmDeleteTransaction=Czy jesteś pewien, że chcesz usunąć te wpis?
 ThisWillAlsoDeleteBankRecord=To usunie wygenerowany wpis bankowy
@@ -135,8 +136,8 @@ BankTransactionLine=Wpis bankowy
 AllAccounts=All bank and cash accounts
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkie konta
-FutureTransaction=Transakcja w przyszłości. Nie da się pogodzić.
-SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk &quot;Utwórz&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: RRRRMM lub RRRRMMDD
 EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
 ToConciliate=Do zaksięgowania?
@@ -153,7 +154,7 @@ RejectCheckDate=Data wrócił kontrola
 CheckRejected=Czek zwrócony
 CheckRejectedAndInvoicesReopened=Czek zwrócony i faktura ponownie otwarta
 BankAccountModelModule=Szablony dokumentu dla kont bankowych
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=Nowe różne płatności
 VariousPayment=Różne płatności
@@ -162,4 +163,6 @@ ShowVariousPayment=Pokaż różne płatności
 AddVariousPayment=Dodaj inne płatności
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 27510192398..5aae25e4817 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktury
 InvoiceProFormaDesc=<b>Faktura proforma</b> jest obrazem prawdziwej faktury, ale nie ma jeszcze wartości księgowych.
 InvoiceReplacement=Duplikat faktury
 InvoiceReplacementAsk=Duplikat faktury do faktury
-InvoiceReplacementDesc=<b>Zastąpienie faktury</b> służy do anulowania i/lub całkowitego zastąpienia faktury dla, której nie odnotowano wpłaty. <br><br> Uwaga: Można zastąpić tylko faktury bez zapłaty. Jeżeli korekta nie jest jeszcze zamknięta/ukończona, zostanie ona automatycznie zamknięta i przeniesiona do "porzucone".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Nota kredytowa
 InvoiceAvoirAsk=Edytuj notatkę do skorygowania faktury
-InvoiceAvoirDesc=<b>Nota kredytowa</b> jest negatywną fakturą/korektą wykorzystywaną do rozwiązania w przypadku gdy na fakturze jest kwota, która różni się od kwoty faktycznie wypłaconej (ponieważ klient wypłacił przez pomyłkę zbyt dużo, będzie wypłacona w całości, lub zwrócił niektóre produkty). <br><br> Uwaga: oryginał faktury musi być już zamknięty ( "wpłacona" lub "częściowo wpłacana") w celu umożliwienia stworzenia noty kredytowej na jej temat.
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Tworzenie kredytowa Uwaga liniami z faktury pochodzenia
 invoiceAvoirWithPaymentRestAmount=Tworzenie kredytowa z nieopłacone Uwaga faktury pochodzenia
 invoiceAvoirLineWithPaymentRestAmount=Nota kredytowa na kwotę pozostałą nieodpłatną
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Spłacona
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy jesteś pewien, że chcesz usunąć tą płatność?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Płatności dostawców
 ReceivedPayments=Otrzymane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
-PayedSuppliersPayments=Płatności zapłacone dostawcom
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Odebrane płatności klientów do potwierdzenia
 PaymentsReportsForYear=Raporty płatności dla %s
 PaymentsReports=Raporty płatności
@@ -91,8 +91,8 @@ PaymentConditionsShort=Warunki płatności
 PaymentAmount=Kwota płatności
 ValidatePayment=Weryfikacja płatności
 PaymentHigherThanReminderToPay=Płatności wyższe niż upomnienie do zapłaty
-HelpPaymentHigherThanReminderToPay=Uwaga, płatność kwoty jednego lub więcej rachunków jest wyższa potrzeba. <br> Wprowadź edycje wpisu lub potwierdź i pomyśl o stworzeniu noty kredytowej dla nadwyżki otrzymanych z nadpłaty faktur.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasyfikacja "wpłacono"
 ClassifyPaidPartially=Klasyfikacja "wpłacono częściowo"
 ClassifyCanceled=Klasyfikacja "Porzucono"
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zamknięte (nie zapłacone)
 BillStatusClosedPaidPartially=Opłacone (częściowo)
 BillShortStatusDraft=Szkic
 BillShortStatusPaid=Płatność
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Płatność
 BillShortStatusCanceled=Opuszczone
 BillShortStatusValidated=Zatwierdzone
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zamknięte
 BillShortStatusClosedPaidPartially=Opłacono (częściowo)
 PaymentStatusToValidShort=Do potwierdzenia
-ErrorVATIntraNotConfigured=Stopa Vat niezdefiniowana
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Brak zdefiniowanego domyślnego trybu płatności. Przejdź do modułu faktur by naprawić to. 
 ErrorCreateBankAccount=Utwórz konto bankowe, a następnie przejść do panelu konfiguracji modułu faktury by zdefiniować sposób płatności
 ErrorBillNotFound=Faktura %s nie istnieje
-ErrorInvoiceAlreadyReplaced=Błąd, próbujesz zweryfikować fakturę by zastąpić fakturę %s. Niestety została ona już zastąpiona przez fakturę %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Błąd, zniżka już używana
 ErrorInvoiceAvoirMustBeNegative=Błąd, korekty faktury muszą mieć negatywny kwotę
 ErrorInvoiceOfThisTypeMustBePositive=Błąd ten typ faktury musi mieć dodatnią wartość
 ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować faktury, która została zastąpiona przez inną fakturę, będącą ciągle w stanie projektu.
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Od
 BillTo=Do
 ActionsOnBill=Działania na fakturze
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Czy jesteś pewien, że chcesz zmienić status faktury <
 ConfirmCancelBill=Czy jesteś pewien, że chcesz anulować fakturę <b>%s</b>?
 ConfirmCancelBillQuestion=Dlaczego chcesz sklasyfikować tę fakturę jako „porzuconą”?
 ConfirmClassifyPaidPartially=Czy jesteś pewien, że chcesz zmienić status faktury <b>%s</b> na zapłaconą?
-ConfirmClassifyPaidPartiallyQuestion=Ta faktura nie została zapłacona w całości. Jaka jest przyczyna, że chcesz zamknąć tą fakturę?
-ConfirmClassifyPaidPartiallyReasonAvoir=Upływającym nieopłaconym <b>(%s %s)</b> jest przyznana zniżka, ponieważ płatność została dokonana przed terminem. Uregulowano podatku VAT do faktury korygującej.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Upływające nieopłacone <b>(%s %s)</b> jest przyznana zniżka, ponieważ płatność została dokonana przed terminem. Akceptuję stracić VAT na tej zniżce.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Upływające nieopłacone <b>(% s% s)</b> mają przyznaną zniżkę, ponieważ płatność została dokonana przed terminem. Odzyskano VAT od tej zniżki bez noty kredytowej.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Zły klient
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone
 ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucona z innej przyczyny
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Wybór ten jest możliwe, jeżeli faktury zostały wyposażone w odpowiedni komentarz. (Przykład &quot;Tylko podatku odpowiadającej cenie, które zostały faktycznie zapłacone daje prawa do odliczenia&quot;)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=W niektórych krajach ten wybór może być możliwe tylko wówczas, gdy na fakturze zawiera prawidłowe notatki.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Użyj tego wyboru, jeśli wszystkie inne nie odpowiadają
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>zły klient</b> jest klientem odmówić spłaty długu.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ten wybór jest używany, gdy płatność nie jest kompletna, ponieważ niektóre produkty zostały zwrócone
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Użyj tego wyboru, jeśli wszystkie inne nie odpowiadać, na przykład w następującej sytuacji: <br> - Opłaty nie są kompletne, ponieważ niektóre produkty zostały wysłane z powrotem <br> - Kwota zbyt ważne, gdyż twierdził, rabat został zapomniany <br> We wszystkich przypadkach kwota ponad twierdził musi być rozwiązany w księgowości system poprzez stworzenie kredytu notatkę.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Inny
 ConfirmClassifyAbandonReasonOtherDesc=Wybór ten będzie używany we wszystkich innych przypadkach. Na przykład wówczas. gdy planujesz utworzyć fakturę zastępującą.
 ConfirmCustomerPayment=Potwierdzasz wprowadzenie płatności dla <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Potwierdzasz wprowadzenie płatności dla <b>%s</b> %s?
 ConfirmValidatePayment=Czy jesteś pewny, że chcesz zatwierdzić tą płatność? Nie będzie można wprowadzić zmian po zatwierdzeniu płatności.
 ValidateBill=Zatwierdź fakturę
 UnvalidateBill=Niepotwierdzona faktura
-NumberOfBills=Ilość faktur
-NumberOfBillsByMonth=Ilość faktur w miesiącu
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Kwota faktury
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Kwota faktur przez miesiąc (netto)
 ShowSocialContribution=Pokaż składkę ZUS/podatek
 ShowBill=Pokaż fakturę
@@ -260,9 +262,9 @@ Repeatables=Szablony
 ChangeIntoRepeatableInvoice=Konwersja do szablonu faktury
 CreateRepeatableInvoice=Tworzenie szablonu faktury
 CreateFromRepeatableInvoice=Utwórz z szablonu faktury
-CustomersInvoicesAndInvoiceLines=Klienta faktury i faktury linii
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Faktury i płatności klienta
-ExportDataset_invoice_1=Klient faktury i faktury listę "linii
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Faktury i płatności klienta
 ProformaBill=Proforma Bill:
 Reduction=Rabat
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill adres
-HelpEscompte=Ta zniżka zniżki przyznawane klienta, ponieważ jego paiement został złożony przed terminem.
-HelpAbandonBadCustomer=Kwota ta została opuszczonych (klient mówi się, że zły klient) i jest uważany za exceptionnal luźne.
-HelpAbandonOther=Kwota ta została opuszczonych, ponieważ był to błąd (zły klient otrzymuje fakturę lub inny na przykład)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=ID płatności składki ZUS/podatku
 PaymentId=ID Płatności
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nie wybrano faktury
 CloneInvoice=Powiel fakturę
 ConfirmCloneInvoice=Czy jesteś pewien, że chcesz powielić tą fakturę <b>%s</b>?
 DisabledBecauseReplacedInvoice=Działania wyłączone, ponieważ na fakturze została zastąpiona
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Ilość płatności
+DescTaxAndDividendsArea=Obszar ten stanowi podsumowanie wszystkich płatności dokonanych na specjalne wydatki. Tylko zapisy z płatności w czasie ustalonym roku zostały tu uwzględnione.
+NbOfPayments=No. of payments
 SplitDiscount=Split zniżki w dwóch
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Wejście kwoty dla każdego z dwóch części:
-TotalOfTwoDiscountMustEqualsOriginal=Suma dwóch nowych rabatu musi być równa kwocie pierwotnego zniżki.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Czy jesteś pewien, że chcesz usunąć tą zniżkę?
 RelatedBill=Powiązana faktura
 RelatedBills=Powiązane faktury
 RelatedCustomerInvoices=Powiązane z: faktury klienta
 RelatedSupplierInvoices=Pozwiązane z: faktura dostawca
 LatestRelatedBill=Ostatnie powiązane faktury
-WarningBillExist=Ostrzeżenie, jedna lub więcej faktur istnieje
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Narzędzie do dzielenia PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Czek
 PaymentTypeShortCHQ=Czek
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Płatności on-line
-PaymentTypeShortVAD=Płatności on-line
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Szkic
 PaymentTypeFAC=Współczynnik
 PaymentTypeShortFAC=Współczynnik
 BankDetails=Szczegóły banku
 BankCode=Kod banku
-DeskCode=Recepcja kod
+DeskCode=Office code
 BankAccountNumber=Numer konta
-BankAccountNumberKey=Klucz
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=Numer IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT numer
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Płatność przelewem na następujące konto
 VATIsNotUsedForInvoice=* Nie dotyczy sztuki VAT-293B z CGI
 LawApplicationPart1=Poprzez stosowanie prawa 80,335 do 12/05/80
 LawApplicationPart2=towary pozostają własnością
-LawApplicationPart3=sprzedającego do pełna cashing z
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=ich ceny.
 LimitedLiabilityCompanyCapital=SARL z Stolicy
 UseLine=Zastosować
@@ -463,7 +465,7 @@ Cheques=Czeki
 DepositId=ID depozytu
 NbCheque=Ilość czeków
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Użyj rozliczeniowe klienta adres kontaktowy zamiast trzeciej adres odbiorcy za faktury
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
 ShowUnpaidLateOnly=Pokaż późno unpaid fakturze tylko
 PaymentInvoiceRef=Płatność faktury %s
@@ -474,21 +476,22 @@ Reported=Opóźniony
 DisabledBecausePayments=Nie możliwe, ponieważ istnieją pewne płatności
 CantRemovePaymentWithOneInvoicePaid=Nie można usunąć płatności, ponieważ istnieje przynajmniej na fakturze sklasyfikowane płatne
 ExpectedToPay=Oczekuje płatności
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Wypłacana przez płatność
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Klasyfikująsubstancje "Paid" wszystkie noty kredytowe w całości zwrócona.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Wszystkie faktury bez kwoty do zapłaty zostaną automatycznie zamknięte i oznaczone statusem "Zapłacono"
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Płacić
 ToMakePaymentBack=Spłacać
 ListOfYourUnpaidInvoices=Lista niezapłaconych faktur
 NoteListOfYourUnpaidInvoices=Uwaga: Ta lista zawiera tylko faktury dla osób trzecich jesteś powiązanych jako przedstawiciel sprzedaży.
 RevenueStamp=Znaczek skarbowy
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Faktura Crabe modelu. Pełna faktura modelu (VAT Wsparcie opcji, rabaty, warunki płatności, logo, itp. ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla standardowych faktur i %srrmm-nnnn dla not kredytowych, gdzie rr oznacza rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Usuń szablon faktury
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Faktura usunięta
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 2783b9658c5..8b38064b307 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Pokaż firmę
 ShowStock=Pokaż magazyn
 DeleteArticle=Kliknij, aby usunąć ten artykuł
 FilterRefOrLabelOrBC=Szukaj (Ref / Label)
-UserNeedPermissionToEditStockToUsePos=Próbujesz zmniejszyć zapasy na fakturze stworzonej, więc użytkownik by mógł używać POS potrzebuje mieć uprawnienie by edytować zapasy.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Drukarka fiskalna Dolibarr
+PointOfSale=Punktów sprzedaży
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index aabac7a4500..8933a602345 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefon
 ActionAC_FAX=Wyślij faks
 ActionAC_PROP=Wyślij propozycję pocztą
 ActionAC_EMAIL=Wyślij e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Spotkania
 ActionAC_INT=Interwencja na stronie
 ActionAC_FAC=Wyślij fakturę/rozliczenie pocztą
@@ -72,8 +73,8 @@ StatusProsp=Stan oferty
 DraftPropals=Szkic oferty handlowej
 NoLimit=Bez limitu
 ToOfferALinkForOnlineSignature=Link dla podpisu online
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Funkcjonalność podpisu online wyłączona lub dokument wygenerowano przed włączeniem tej funkcji
diff --git a/htdocs/langs/pl_PL/dict.lang b/htdocs/langs/pl_PL/dict.lang
index 9888ae40d0a..cfd05fcce6e 100644
--- a/htdocs/langs/pl_PL/dict.lang
+++ b/htdocs/langs/pl_PL/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Wyspa Heard i McDonalda
 CountryVA=Stolica Apostolska (Państwo Watykańskie)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Indie
 CountryID=Indonezja
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Korea Północna
 CountryKR=Korea Południowa
 CountryKW=Kuwejt
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Laotański
 CountryLV=Łotwa
 CountryLB=Liban
@@ -160,7 +160,7 @@ CountryMD=Mołdawia
 CountryMN=Mongolia
 CountryMS=Montserrat
 CountryMZ=Mozambik
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trynidad i Tobago
 CountryTR=Turcja
 CountryTM=Turkmenistan
-CountryTC=Wyspy Turks i Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupii
 CurrencySingMUR=rupia Mauritius
 CurrencyNOK=Koron norweskich
-CurrencySingNOK=Korona norweska
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=TND
 CurrencySingTND=Dinar tunezyjski
 CurrencyUSD=US Dollar
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Pracownik
 DemandReasonTypeSRC_SPONSORING=Sponsorowanie
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index 4b5feca5c01..c4171fd621d 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=ilość dokumentów w katalogu
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Katalog
 ECMSectionManual=Katalog manualny
 ECMSectionAuto=Katalog automatyczny
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenty powiązane z projektami
 ECMDocsByUsers=Dokumenty powiązane z użytkownikami
 ECMDocsByInterventions=Dokumenty powiązane z interwencjami
 ECMDocsByExpenseReports=Dokumenty dołączone do raportów kosztowych
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Brak utworzonego katalogu
 ShowECMSection=Pokaż katalog
 DeleteSection=Usuń katalog
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 7d0d726e9ef..7a316213032 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=Klient SOAP nie powiodło się z powodu błędu '% s
 ErrorGlobalVariableUpdater5=Nie wybrano zmiennej globalnej
 ErrorFieldMustBeANumeric=Pole <b>%s</b> musi mieć wartość numeryczną
 ErrorMandatoryParametersNotProvided=Obowiązkowe parametr (y) nie przewidziane
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad definicja tablicy w menu modułu deskryptora (zły stosunek jakości do kluczowego fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
 WarningMandatorySetupNotComplete=Parametry konfiguracyjne obowiązkowe nie są jeszcze określone
diff --git a/htdocs/langs/pl_PL/help.lang b/htdocs/langs/pl_PL/help.lang
index 68b7bee21bc..cbc4569a284 100644
--- a/htdocs/langs/pl_PL/help.lang
+++ b/htdocs/langs/pl_PL/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online w czasie rzeczywistym / zdalne wsparcie
 OtherSupport=Inne wsparcie
 ToSeeListOfAvailableRessources=Aby skontaktować / patrz dostępne zasoby:
 HelpCenter=Centrum pomocy
-DolibarrHelpCenter=Centrum pomocy i obsługi technicznej
-ToGoBackToDolibarr=W innym przypadku, kliknij <a href="%s">tutaj, aby używać Dolibarr</a>
-TypeOfSupport=Źródła wsparcia
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Społeczność (za darmo)
 TypeSupportCommercial=Komercyjny
 TypeOfHelp=Typ
@@ -15,12 +15,9 @@ NeedHelpCenter=Potrzebujesz pomocy lub wsparcia?
 Efficiency=Efektywność
 TypeHelpOnly=Tylko pomoc
 TypeHelpDev=Pomoc+Rozwoj
-TypeHelpDevForm=Pomoc + Rozwoju + Formacja
-ToGetHelpGoOnSparkAngels1=Niektóre firmy mogą zapewnić szybki (niekiedy natychmiastową) i bardziej wydajnych sieci wsparcia poprzez podjęcie kontroli nad komputerem. Takie pomocników można znaleźć na stronie <b>internetowej %s:</b>
-ToGetHelpGoOnSparkAngels3=Można też przejść do listy wszystkich dostępnych dla autokarów Dolibarr, w tym kliknąć przycisk
-ToGetHelpGoOnSparkAngels2=Czasami nie ma firmy dostępne w tej chwili można dokonać wyszukiwania, dlatego uważam, aby zmienić filtr do poszukiwania "dostępność wszystkich". Będziesz mógł wysłać więcej wniosków.
-BackToHelpCenter=W innym przypadku, kliknij tutaj, aby przejść <a href="%s">wstecz na stronie głównej Centrum pomocy.</a>
-LinkToGoldMember=Możesz połączyć jedno z trenera wybranej przez Dolibarr dla danego języka ( %s), klikając jego Widget (status i maksymalną cenę są automatycznie uaktualniane):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Obsługiwane języki
-SubscribeToFoundation=Pomoc projekt Dolibarr, zapisz się na fundamencie
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Do oficjalnego wsparcia Dolibarr w Twoim języku: <br> <a href="%s" target="_blank"><b>% S</b></a>
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index a3f2acbf11a..aa2096d8ca7 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Urlopy
-CPTitreMenu=Urlopy
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Miesięczne zestawienie
 MenuAddCP=Nowy wniosek urlopowy
-NotActiveModCP=Musisz włączyć moduł Urlopów aby zobaczyć tą stronę.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Stwórz wniosek  urlopowy
 DateDebCP=Data rozpoczęcia
 DateFinCP=Data zakończenia
@@ -15,18 +15,18 @@ ApprovedCP=Zatwierdzony
 CancelCP=Odwołany
 RefuseCP=Odrzucony
 ValidatorCP=Akceptujący
-ListeCP=Lista urlopów
+ListeCP=List of leave
 LeaveId=Leave ID
 ReviewedByCP=Będzie zatwierdzony przez
 UserForApprovalID=User for approval ID
-UserForApprovalFirstname=Firstname of approval user
-UserForApprovalLastname=Lastname of approval user
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Tworzenie wniosku urlopowego
 DelayToRequestCP=Wniosek urlopowy musi być stworzony przynajmniej <b>%s dzień (i) </b> przed jego rozpoczęciem.
-MenuConfCP=Bilans urlopów
-SoldeCPUser=Liście saldo <b>jest% s</b> dni.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Musisz wybrać datę zakończenia większą niż data rozpoczęcia.
 ErrorSQLCreateCP=Wystąpił błąd SQL podczas tworzenia:
 ErrorIDFicheCP=Wystąpił błąd, wniosek urlopowy nie istnieje.
@@ -101,8 +101,8 @@ LEAVE_SICK=Sick leave
 LEAVE_OTHER=Other leave
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Ostatnia automatyczna aktualizacja alokacji urlopów
-MonthOfLastMonthlyUpdate=Miesiąc ostatniej automatycznej aktualizacji alokacji urlopów
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Zaktualizowane.
 Module27130Name= Zarządzanie wnioskami urlopowymi
 Module27130Desc= Zarządzanie wnioskami urlopowymi
@@ -112,7 +112,7 @@ NoticePeriod=Okres wypowiedzenia
 HolidaysToValidate=Zatwierdź wnioski urlopowe
 HolidaysToValidateBody=Poniżej jest wniosek o dopuszczenie do sprawdzenia
 HolidaysToValidateDelay=Wniosek ten urlop odbędzie się w ciągu mniej niż% s dni.
-HolidaysToValidateAlertSolde=Użytkownik, który stworzył ten wniosek urlopowy nie ma wystarczających ilości dni.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Zatwierdzone wnioski urlopowe
 HolidaysValidatedBody=Twój wniosek urlopowy od %s do %s został zatwierdzony.
 HolidaysRefused=Zapytanie zaprzeczył
@@ -121,4 +121,9 @@ HolidaysCanceled=Anulowane wniosku urlopowego
 HolidaysCanceledBody=Twój wniosek urlopowy od %s do %s został anulowany.
 FollowedByACounter=1: Ten typ urlopu musi być prześledzony przez licznik. Licznik jest  zwiększany ręcznie lub automatycznie, a po zwolnieniu żądania urlopu, licznik jest zmniejszany. <br> 0: Nie śłedzone przez licznik.
 NoLeaveWithCounterDefined=Nie ma żadnych zdefiniowanych typów urlopu które  muszą być prześledzone przez licznik
-GoIntoDictionaryHolidayTypes=Idź do <strong>Home - Ustawienia - Słowniki - Rodzaj urlopów</strong> w celu stworzenia różnych typów urlopów.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 4f623677fee..40a31d71cd5 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Postępuj według instrukcji krok po kroku.
 MiscellaneousChecks=Sprawdzenie wymagań
 ConfFileExists=Plik konfiguracyjny <b>%s</b> istnieje.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Plik konfiguracyjny <b>%s</b> nie istnieje i nie mógł zostać utworzony!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Plik konfiguracyjny <b>%s</b> został lub mógł zostać utworzony.
-ConfFileIsNotWritable=Plik konfiguracyjny <b>%s</b> nie ma uprawnień do zapisu. Sprawdź uprawnienia. Przy pierwszej instalacji Twój serwer WWW musi posiadać uprawnienia do zapisu tego pliku podczas procesu konfiguracji (Dla systemów uniksowych wystarczy wykonać polecenie "chmod 666").
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Plik konfiguracyjny <b>%s</b> ma uprawnienia do zapisu.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Odśwież wszystkie informacje z pliku konfiguracyjnego.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP obsługuje sesje.
 PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
-PHPSupportPOSTGETKo=Możliwe, że PHP nie obsługuje zmiennych POST i/lub GET. Sprawdź parametr <b>variables_order</b> w php.ini.
-PHPSupportGD=PHP obsługuje graficzne funkcje GD.
-PHPSupportCurl=Ta wersja PHP wspiera Curl
-PHPSupportUTF8=Ta wersja PHP oferuje wsparcie funkcji UTF8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na <b>%s</b>. Powinno wystarczyć.
-PHPMemoryTooLow=Maksymalna ilość pamięci sesji PHP <b>%s</b> bajtów. To może nie wystarczyć. Zmień w <b>php.ini</b> parametr <b>memory_limit</b> na przynajmniej <b>%s</b> bajtów.
-Recheck=Potwierdź w celu dokładniejszego testu
-ErrorPHPDoesNotSupportSessions=Instalacja PHP nie obsługuje sesji. Taka funkcjonalność jest wymagana do działania Dolibarra. Sprawdź swoje ustawienia PHP.
-ErrorPHPDoesNotSupportGD=Twoja instalacji PHP nie obsługuje funkcji graficznych GD. wykresy nie będą dostępne.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Twoja instalacja PHP nie wspiera Curl.
-ErrorPHPDoesNotSupportUTF8=Twoja instalacji PHP nie obsługuje funkcji UTF8. Dolibarr może nie działać poprawnie. Rozwiązać ten problem przed instalacją Dolibarr'a.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Katalog %s nie istnieje.
-ErrorGoBackAndCorrectParameters=Cofnij się i popraw złe parametry.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Możliwe, że wprowadzono nieprawidłową wartość dla parametru '%s'.
 ErrorFailedToCreateDatabase=Utworzenie bazy danych '%s' nie powiodło się.
 ErrorFailedToConnectToDatabase=Połączenie z bazą danych '%s' nie powiodło się.
 ErrorDatabaseVersionTooLow=Wersja (%s) bazy danych jest zbyt stara. Wymagana jest wersja %s lub wyższa.
 ErrorPHPVersionTooLow=Wersja PHP zbyt stara. Wymagana wersja to przynajmniej %s.
-ErrorConnectedButDatabaseNotFound=Połączenie z serwerem powiodło się, ale nie znaleziony bazy '%s'.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Baza danych '%s' już istnieje.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Jeśli baza danych nie istnieje, w poprzednim kroku zaznacz opcję "Utwórz bazę danych".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Jeśli baza danych istnieje, w poprzednim kroku odznacz opcję "Utwórz bazę danych".
-WarningBrowserTooOld=Zbyt stara wersja przeglądarki. Zdecydowanie zalecamy wykonanie uaktualnienia do najnowszej wersji przeglądarki Firefox, Chrome lub Opera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Wersja PHP
 License=Użyta licencja
 ConfigurationFile=Plik konfiguracyjny
@@ -45,22 +45,23 @@ DolibarrDatabase=Baza danych Dolibarr'a
 DatabaseType=Rodzaj bazy danych
 DriverType=Rodzaj sterownika
 Server=Serwer
-ServerAddressDescription=Nazwa lub adres IP serwera baz danych, zazwyczaj 'localhost' jeśli serwer baz danych znajduje się fizycznie na tej samej maszynie co serwer WWW
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Port serwera baz danych. Zostaw puste jeśli nie znasz.
 DatabaseServer=Serwer baz danych
 DatabaseName=Nazwa bazy danych
-DatabasePrefix=Tabela prefiksów bazy danych
-AdminLogin=Login do administratora bazy danych
-PasswordAgain=Powtórz hasło
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Hasło do bazy danych
 CreateDatabase=Utwórz bazę danych
-CreateUser=Utwórz właściciela lub nadaj mu uprawnienia w bazie danych
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Baza danych z dostępem na prawach superużytkownika
-CheckToCreateDatabase=Zaznacz jeśli baza danych nie istnieje i musi zostać utworzona.<br>W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
-CheckToCreateUser=Zaznacz pole jeśli właściciel bazy danych nie istnieje i musi zostać stworzony, lub jeśli istnieje ale baza danych nie istnieje i uprawnienia muszą zostać nadane. <br> W takim przypadku, musisz wybrać jego login i hasło oraz wypełnić login i hasło konta super użytkownika na spodzie tej strony. Jeśli to pole jest nie zaznaczone, właściciel bazy danych i jego hasło musi istnieć.
-DatabaseRootLoginDescription=Login użytkownika mogącego tworzyć nowe bazy lub nowych użytkowników, wymagane jeśli baza danych oraz jej właściciel nie istnieją.
-KeepEmptyIfNoPassword=Zostaw puste jeśli użytkownik nie posiada hasła (unikaj takiej sytuacji)
-SaveConfigurationFile=Zapis wartości
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Połączenie z serwerem
 DatabaseCreation=Utworzenie bazy danych
 CreateDatabaseObjects=Tworzenie obiektów w bazie danych
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Tworzenie kluczy obcych oraz indeksów dla tabeli %s
 OtherKeysCreation=Tworzenie kluczy obcych oraz indeksów
 FunctionsCreation=Tworzenie funkcji
 AdminAccountCreation=Tworzenie użytkownika
-PleaseTypePassword=Proszę wprowadzić hasło, puste hasła są niedozwolone!
-PleaseTypeALogin=Proszę wprowadzić nazwę użytkownika!
-PasswordsMismatch=Hasła różnią się, spróbuj ponownie!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Koniec ustawień
 SystemIsInstalled=Instalacja zakończona.
 SystemIsUpgraded=Dolibarr został zaktualizowany pomyślnie.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Teraz należy ustawić Dolibarra tak by spełniał Two
 AdminLoginCreatedSuccessfuly=Login administratora Dolibarr '<b>%s</b>' utworzony pomyślnie.
 GoToDolibarr=Idź do Dolibarr'a
 GoToSetupArea=Przejdź do ustawień Dolibarra
-MigrationNotFinished=Wersja bazy danych nie jest w pełni aktualna. Musisz uruchomić proces aktualizacji ponownie.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Wejdź na stronę aktualizacji ponownie
 WithNoSlashAtTheEnd=Bez znaku ukośnika "/" na końcu
-DirectoryRecommendation=Zalecane jest by umieścić ten katalog poza katalogiem ze stronami WWW.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Już istnieje
 DolibarrAdminLogin=Użytkownik administracyjny Dolibarra
-AdminLoginAlreadyExists=Konto administracyjne Dolibarra '<b>%s</b>' już istnieje. Cofnij się jeśli chcesz utworzyć kolejne.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Utworzenie konta administratora Dolibarr nie powiodło się.
-WarningRemoveInstallDir=Ostrzeżenie: ze względów bezpieczeństwa by zapobiec nieuprawnionemu użyciu po instalacji lub aktualizacji powinno się usunąć katalog install lub zmienić jego nazwę na <b>install.lock</b>.
-FunctionNotAvailableInThisPHP=Niedostępne w tej wersji PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Wybierz skrypt migracyjny
 DataMigration=Migracja bazy danych (dane)
 DatabaseMigration=Migracja bazy danych (struktura i niektóre dane)
 ProcessMigrateScript=Przetwarzanie skryptów
 ChooseYourSetupMode=Wybierz tryb instalacji i potwierdź przyciskiem "Start"...
 FreshInstall=Nowa instalacja
-FreshInstallDesc=Użyj tego trybu jeśli to pierwsza instalacja. Jeśli nie, to w tym trybie można naprawić poprzednią niepełną instalację. W przypadku aktualizacji skorzystaj z trybu "Aktualizacja".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Aktualizacja
 UpgradeDesc=Użyj tego trybu jeśli podmieniono stare pliki Dolibarra plikami z nowszej wersji. Ten tryb uaktualni bazę danych i poprzednie dane.
 Start=Start
 InstallNotAllowed=Ustawienie niedostępne przez uprawnienia <b>conf.php</b>
 YouMustCreateWithPermission=Musisz utworzyć plik %s i ustawić mu prawa zapisu dla serwera WWW podczas procesu instalacyjnego.
-CorrectProblemAndReloadPage=Proszę poprawić te ustawienia i odświeżyć stronę (domyślnie F5).
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Migracja już przeprowadzona.
 DatabaseVersion=Wersja bazy danych
 ServerVersion=Wersja serwera baz danych
 YouMustCreateItAndAllowServerToWrite=Musisz utworzyć ten katalog i zezwolić serwerowi WWW na zapis w nim.
 DBSortingCollation=Sposób sortowania znaków
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Wybrano by utworzyć bazę danych <b>%s</b>, ale by tego dokonać Dolibarr musi połączyć się z serwerem <b>%s</b> na prawach superużytkownika <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Wybrano by utworzyć użytkownika <b>%s</b>, ale by tego dokonać Dolibarr musi połączyć się z serwerem <b>%s</b> na prawach superużytkownika <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=Połączenie nie powiodło się. Adres serwera lub parametry superużytkownika musiały być nieprawidłowe.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Osierocona płatność wykryta przez metodę %s
 RemoveItManuallyAndPressF5ToContinue=Usuń go ręcznie i odśwież stronę (domyślnie F5) by kontynuować.
 FieldRenamed=Nazwa pola zmieniona
-IfLoginDoesNotExistsCheckCreateUser=Jeśli login jeszcze nie istnieje, sprawdzić opcję "Utwórz użytkownika"
-ErrorConnection=Serwer <b>" %s",</b> nazwa bazy danych <b>" %s"</b> login <b>" %s"</b> lub hasło bazy danych mogą być złe lub PHP wersji klienckiej może być zbyt stare w porównaniu do wersji bazy danych.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Zalecany wybór: zainstalować <b>wersję %s</b> od aktualnej <b>wersji %s</b>
 InstallChoiceSuggested=<b>Wybór sugerowany przez instalator.</b>
-MigrateIsDoneStepByStep=Konkretna wersja (%s) ma lukę w kilku wersjach, kreator powróci do sugerowawanej kolejnej migracji, kiedy aktualna będzie gotowa.
-CheckThatDatabasenameIsCorrect=Sprawdz czy nazwa bazy danych <b>"%s"</b> jest poprawna.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Jeśli ta nazwa jest poprawna i baza danych jeszcze nie istnieje, sprawdz opcję "utwórz bazę danych"
 OpenBaseDir=PHP parametr otwarcia katalogu bazy danych
-YouAskToCreateDatabaseSoRootRequired=Zaznaczyłeś opcje "Stwórz baze danych". Wprowadz proszę nazwę i hasło Super Użytkownika 
-YouAskToCreateDatabaseUserSoRootRequired=Zaznaczyłeś opcje "Stwórz właściciela bazy danych". Wprowadz proszę nazwę i hasło Super Użytkownika.
-NextStepMightLastALongTime=Aktulany krok potrwa chwilę. By kontynuować, proszę czekać, aż kolejny krok będzie dostępny.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migracja danych przesyłek zamówień odbiorców
 MigrationShippingDelivery=Aktualizacja stanu do wysyłki
 MigrationShippingDelivery2=Aktualizacja stanu do wysyłki 2
 MigrationFinished=Migracja zakończona
-LastStepDesc=<strong>Ostatni krok:</strong> Zdefiniuj tutaj nazwę i hasło, które masz zamiar użyć do połączenia z oprogramowaniem. Zapamiętaj je, ponieważ jest to konto do administrowania wszystkimi innymi ustawieniami.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktywuj moduł %s
 ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
-WarningUpgrade=Uwaga:\nUtworzyłeś najpierw kopię zapasową bazy danych?\nTo jest bardzo rekomendowane: dla przykładu, przez niektóre błędy w bazach danych systemu (np. mysql wersja 5.5.40/41/42/43), niektóre informacje lub tabele mogą zostać utracone podczas tego procesu, więc posiadanie kopii zapasowej bazy danych przed przystąpieniem do procesu migracji jest bardzo rekomendowane.\n\nKliknij OK aby zacząć proces migracji...
-ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych to %s. Ma krytyczną lukę utraty danych jeśli się zmieni struktury na bazie danych, tak jak jest to wymagane podczas procesu migracji. Z tego powodu migracje nie zostaną dopuszczone dopóki nie ulepszysz bazy danych do wyższej wersji  (lista znanych wersji z lukami: %s)
-KeepDefaultValuesWamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
-KeepDefaultValuesDeb=Używasz kreatora instalacji Dolibarr z pakietu Linux (Ubutu, Debian, Fedora..), więc zaproponowane wartości są zoptymalizowane. Musisz stworzyć tylko hasło dla właściciela bazy danych. Inne parametry zmieniaj tylko jeśli wiesz co robisz.
-KeepDefaultValuesMamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
-KeepDefaultValuesProxmox=Możesz skorzystać z kreatora konfiguracji Dolibarr z urządzeniem wirtualnym Proxmox, więc wartości zaproponowane tutaj są już zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
-UpgradeExternalModule=Uruchom dedykowany proces uaktualniania modułów zewnętrznych
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Ustaw przynajmniej jedną opcję jako parametr w adresie URL. Na przykład: '...repair.php?standard=confirmed'
 NothingToDelete=Nic do wyczyszczenia/usunięcia
 NothingToDo=Nic do zrobienia
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Migracja danych dla zamówień dostawców
 MigrationProposal=Migracja danych dla ofert handlowych
 MigrationInvoice=Migracja dla danych faktur odbiorców
 MigrationContract=Migracja danych kontraktów
-MigrationSuccessfullUpdate=Aktualizacja zakończona pomyślnie
+MigrationSuccessfullUpdate=Aktualizacja powiodła się
 MigrationUpdateFailed=Aktualizacja nie powiodła się
 MigrationRelationshipTables=Migracja dla danych spokrewnionych tabel (%s)
 MigrationPaymentsUpdate=Korekta danych płatności
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Korekta danych kontraktowych
 MigrationContractsNumberToUpdate=%s kontraktów do zaktualizowania
 MigrationContractsLineCreation=Utwórz linię kontraktową dla kontraktu %s
 MigrationContractsNothingToUpdate=Nic więcej do zrobienia
-MigrationContractsFieldDontExist=Pole fk_facture już nie istnieje. Nic więcej do zrobienia.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Korekta pustych dat kontraktów
-MigrationContractsEmptyDatesUpdateSuccess=Poprawa pustej daty kontraktu przeprowadzona pomyślnie
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Brak pustych dat kontraktów do korekty
 MigrationContractsEmptyCreationDatesNothingToUpdate=Brak dat utworzenia kontraktów do korekty
 MigrationContractsInvalidDatesUpdate=Nieprawidłowa wartość przy korekcie daty kontraktu
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Aktualizacja dostawy
 MigrationStockDetail=Aktualizacja wartości zapasów produktów
 MigrationMenusDetail=Aktualizacja dynamicznego meni tabeli
 MigrationDeliveryAddress=Aktualizacja adresu dostarczenia przesyłki
-MigrationProjectTaskActors=Migracja danych z tabeli llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migracja danych pola fk_user_resp z llx_projet do llx_element_contact
 MigrationProjectTaskTime=Pokonany czas uaktualnienia w sekundach
 MigrationActioncommElement=Aktualizacja danych na temat działań
 MigrationPaymentMode=Migracji danych w trybie płatności
 MigrationCategorieAssociation=Migracja kategorii
-MigrationEvents=Przenieś wydarzenie by dodać nowego właściciela do przypisanej tabeli.
-MigrationEventsContact=Migracja zdarzeń w celu dodania kontaktu zdarzenia do tabeli przydziału
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise
 MigrationRemiseExceptEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Odśwież moduł %s
 MigrationResetBlockedLog=Zresetuj moduł BlockedLog dla algorytmu v7
-ShowNotAvailableOptions=Pokaż niedostępne opcje.
-HideNotAvailableOptions=Ukryj niedostępne opcje.
-ErrorFoundDuringMigration=Wystąpiły błędy podczas procesu migracji więc następny krok jest nie dostępny. Żeby zignorować błędy, możesz <a href="%s">kliknąć tutaj</a>, ale aplikacja bądź jakieś jej funkcje mogą działać niepoprawnie do póki nie zostaną naprawione.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 6de29454e6b..5a945c97238 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakty dla tego zamówienia
 ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
 AddressesForCompany=Adressy dla części trzeciej
 ActionsOnCompany=Działania na temat tego zamówienia
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika
 ActionsOnProduct=Wydarzenia dotyczące tego produktu
 NActionsLate=%s późno
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Ustaw walutę
 BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić pomoc etykiety
-WebSite=Strona WWW
+WebSite=Website
 WebSites=Strony internetowe
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Website accounts
 ExpenseReport=Raport kosztów
 ExpenseReports=Raporty kosztów
 HR=Dział personalny
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=Aktualnie korzystasz z trybu "sandbox" %s
+Inventory=Inwentaryzacja
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index fcaa9192429..810e900d0f8 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Związany obiektu
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=Link strony
 WEBSITE_TITLE=Tytuł
 WEBSITE_DESCRIPTION=Opis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Słowa kluczowe
 LinesToImport=Lines to import
diff --git a/htdocs/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang
index da58e79360b..a7706113fa9 100644
--- a/htdocs/langs/pl_PL/paybox.lang
+++ b/htdocs/langs/pl_PL/paybox.lang
@@ -3,14 +3,14 @@ PayBoxSetup=PayBox konfiguracji modułu
 PayBoxDesc=Moduł ten oferują strony, umożliwiające płatności na <a href="http://www.paybox.com" target="_blank">Paybox</a> przez klientów. Może to być wykorzystane do swobodnej zapłaty lub płatności w szczególności obiektu Dolibara np za faktury, zamówienia, ...
 FollowingUrlAreAvailableToMakePayments=Nastepujące adresy są dostępne dla klienta, by mógł dokonać płatności za faktury zamówienia
 PaymentForm=Forma płatności
-WelcomeOnPaymentPage=Witamy w naszej usłudze płatności online
+WelcomeOnPaymentPage=Witaj w naszym serwisie płatności online
 ThisScreenAllowsYouToPay=Ten ekran pozwala na dokonanie płatności on-line do %s.
 ThisIsInformationOnPayment=To jest informacja o płatności do zrobienia
 ToComplete=Aby zakończyć
 YourEMail=E-mail by otrzymać potwierdzenie zapłaty
 Creditor=Wierzyciel
 PaymentCode=Kod płatności
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Zapłać kartą kredytową lub debetową (Paybox)
 ToPay=Wykonaj płatność
 YouWillBeRedirectedOnPayBox=Zostaniesz przekierowany na zabezpieczoną stronę Paybox bys mógł podać informację z karty kredytowej.
 Continue=Dalej
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online int
 ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferowania płatności online %s interfejsu użytkownika do umowy
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferowania płatności online %s interfejsu użytkownika w celu utworzenia dowolnej kwoty.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Adres URL do zaoferowania płatności online %s interfejs użytkownika jest członkiem subskrypcji
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Możesz również dodać parametr <b>&</b> url <b>= <i>wartość</i> tagu</b> do żadnej z tych adresów URL (wymagany tylko dla bezpłatnych), aby dodać swój komentarz płatności tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Skonfiguruj PayBox url <b>z %s</b> do opłay stworzonych automatycznie, gdy są zatwierdzone przez paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Ustaw swój Paybox z linkiem <b>%s</b> żeby utworzyć płatność automatycznie gdy zatwierdzone przez Paybox 
 YourPaymentHasBeenRecorded=Ta strona potwierdza, że ​​płatność została wprowadzona. Dziękuję.
-YourPaymentHasNotBeenRecorded=Twoja płatność nie została wprowadzona i transakcja została anulowana. Dziękuję.
+YourPaymentHasNotBeenRecorded=Twoja płatność nie została zatwierdzona i transakcja została anulowana. Dziękujemy
 AccountParameter=Parametry konta
 UsageParameter=Parametry serwera
 InformationToFindParameters=Pomóż znaleźć %s informacje o koncie
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index 55294b93689..0c7aa55519b 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Podpisano (do rachunku)
 PropalStatusNotSigned=Nie podpisały (zamknięte)
 PropalStatusBilled=zapowiadane
 PropalStatusDraftShort=Szkic
-PropalStatusValidatedShort=Zatwierdzony
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zamknięte
 PropalStatusSignedShort=Podpisany
 PropalStatusNotSignedShort=Niepodpisany
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s nie znaleziono
 AddToDraftProposals=Dodaj do projektu oferty
 NoDraftProposals=Brak projektu oferty
 CopyPropalFrom=Stwórz ofertę handlową poprzez skopiowanie istniejącej oferty
-CreateEmptyPropal=Utwórz pustą ofertę handlową lub z wykazu produktów / usług
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Domyślny czas ważności wniosku handlowych (w dniach)
-UseCustomerContactAsPropalRecipientIfExist=Użyj klienta adres, jeśli określone zamiast trzeciej adres wniosku adres odbiorcy
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Powiel propozycję handlową
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=kontakt klienta w ślad za wniosek
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Kompletny wniosek modelu (logo. ..)
+DocModelCyanDescription=Kompletny wniosek modelu (logo. ..)
 DefaultModelPropalCreate=Domyślny model kreacji.
 DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania)
 DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane )
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index a5d18f9bc77..a5265f03113 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteSetupDesc=Stwórz tyle stron ile potrzebujesz. Następnie przejść do menu Strony WWW by je edytować
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Skasuj stronę
-ConfirmDeleteWebsite=Jesteś pewny że chcesz skasować stronę? Całą jej zawartość zostanie usunięta.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Nazwa strony
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL zewnętrznego pliku CSS
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Biblioteka mediów
-EditCss=Edytuj styl / CSS lub nagłówek HTML
+EditCss=Edit website properties
 EditMenu=Edytuj Menu
 EditMedias=Edit medias
-EditPageMeta=Edytuj koniec
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Dodaj stronę
 HomePage=Strona główna
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Podgląd twojej strony <strong>%s</strong> nie jest jeszcze dostępny. Musisz najpierw dodać stronę.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=Zobacz stronę w nowej zakładce
 SetAsHomePage=Ustaw jako stronę domową
 RealURL=Prawdziwy link
 ViewWebsiteInProduction=Zobacz stronę używając linków ze strony głównej
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Czytać
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=Brak stron
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Duplikuj stronę
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 0a627492c4e..ee3b5d298d8 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -25,9 +25,7 @@ JournalizationInLedgerStatus=Situação do registro do diário
 AlreadyInGeneralLedger=Já foram Livros de registro em livros contabilísticos
 NotYetInGeneralLedger=Ainda não publicado em livros contábeis
 GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
-DetailByAccount=Mostrar detalhes por conta
 AccountWithNonZeroValues=Contas com valores não zerados
-ListOfAccounts=Lista de contas
 MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
 MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
 MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
@@ -107,13 +105,10 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contábil padrão para os produtos vendido
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contábil padrão para os serviços comprados (se não for definido na listagem de serviços)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contábil padrão para os serviços vendidos (se não for definido na listagem de serviços)
 LabelAccount=Conta rótulo
-LabelOperation=Operação de etiqueta
 Sens=Significado
 TransactionNumShort=Nº da transação
 GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados.
-ByPredefinedAccountGroups=Por grupos predefinidos
-ByPersonalizedAccountGroups=Por grupos personalizados
 NotMatch=Não Definido
 DeleteMvt=Excluir linha do razão
 DelYear=Ano a ser deletado
@@ -131,7 +126,6 @@ ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo temp
 AddCompteFromBK=Adicionar contas contábeis ao grupo
 ListAccounts=Lista das contas contábeis
 UnknownAccountForThirdparty=Conta de terceiros desconhecida. Usaremos %s
-UnknownAccountForThirdpartyBlocking=Conta de terceiros desconhecida. Erro de bloqueio
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros desconhecida e conta de espera não definida. Erro de bloqueio
 Pcgtype=Plano de Contas
 Pcgsubtype=Subgrupo de Contas
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 3c19a695735..48f1162bc98 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -25,7 +25,6 @@ NewCompanyToDolibarr=Terceiro %s criados
 ContractValidatedInDolibarr=Contrato %s validado
 PropalClosedSignedInDolibarr=Proposta %s assinada
 PropalClosedRefusedInDolibarr=Proposta %s declinada
-PropalValidatedInDolibarr=Orçamento %s validado
 PropalClassifiedBilledInDolibarr=Proposta %s classificada faturada
 InvoiceValidatedInDolibarr=Fatura %s validada
 InvoiceValidatedInDolibarrFromPos=Fatura %s validada no POS
diff --git a/htdocs/langs/pt_BR/assets.lang b/htdocs/langs/pt_BR/assets.lang
new file mode 100644
index 00000000000..877bd41ecd1
--- /dev/null
+++ b/htdocs/langs/pt_BR/assets.lang
@@ -0,0 +1,59 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@zendsi.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Ativos
+NewAsset = Novo Ativo
+AccountancyCodeAsset = Código contábil (ativo)
+AccountancyCodeDepreciationAsset = Código contábil (conta de ativo de depreciação)
+AccountancyCodeDepreciationExpense = Código contábil (conta de despesas de depreciação)
+NewAssetType=Novo tipo de ativo
+AssetsTypeSetup=Configuração do tipo de ativos
+AssetTypeModified=Tipo de ativo modificado
+AssetType=Tipo de ativo
+AssetsLines=Ativos
+DeleteType=Excluir
+DeleteAnAssetType=Excluir um tipo de recurso
+ConfirmDeleteAssetType=Tem certeza de que deseja excluir este tipo de recurso?
+ShowTypeCard=Ver tipo '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Ativos
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Descrição dos Ativos
+
+#
+# Admin page
+#
+AssetsSetup = Configuração de Ativos
+Settings = Configurações
+AssetsSetupPage = Página de configuração de ativos
+ExtraFieldsAssetsType = Atributos Complementares (Tipo de Ativos)
+AssetsType=Tipo de ativo
+AssetsTypeId=Id Tipo de ativo
+AssetsTypeLabel=Rótulo do tipo de ativo
+AssetsTypes=Tipos de ativos
+
+#
+# Menu
+#
+MenuAssets = Ativos
+MenuNewAsset = Novo Ativo
+MenuTypeAssets = Digitar ativos
+MenuListAssets = Lista
+MenuNewTypeAssets = Novo tipo
+MenuListTypeAssets = Lista
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 8ac26437ded..6153514723e 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -34,8 +34,6 @@ BankAccountOwner=Nome do titular da conta
 BankAccountOwnerAddress=Endereço do titular da conta
 RIBControlError=Verificação da integridade dos valores falhou. Isso significa que esse número de conta não esta completo ou errado (verifique país, número e agência).
 CreateAccount=Criar conta
-NewFinancialAccount=Nova conta financeira
-MenuNewFinancialAccount=Nova conta financeira
 EditFinancialAccount=Editar conta
 LabelBankCashAccount=Rótulo do banco ou caixa
 AccountType=Tipo de conta
@@ -81,7 +79,6 @@ NotReconciled=Não conciliada
 SupplierInvoicePayment=Pagamento a fornecedores
 SocialContributionPayment=Pagamento de contribuição social
 BankTransfers=Transferências bancárias
-MenuBankInternalTransfer=Transferência interna
 TransferDesc=Transferência de uma conta para outra, o Dolibarr criará dois registros (um débito na conta de origem e um crédito na conta de destino. A mesma quantia (exceto o sinal), rótulo e data serão usados para esta transação).
 TransferFromToDone=Uma transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi registrado.
 ValidateCheckReceipt=Validar este comprovante de cheque?
@@ -100,7 +97,6 @@ ExportDataset_banque_2=Comprovante de depósito
 TransactionOnTheOtherAccount=Transação de outra conta
 PaymentNumberUpdateSucceeded=Número de pagamentos atualizado com sucesso
 PaymentNumberUpdateFailed=Número de pagamento não foi possível ser atualizada
-PaymentDateUpdateSucceeded=Data de pagamento atualizada com sucesso
 PaymentDateUpdateFailed=Data de pagamento não foi possível ser atualizada
 Transactions=Transações
 BankTransactionLine=Entrada no bancária
@@ -116,16 +112,10 @@ DefaultRIB=BAN padrão
 LabelRIB=Rótulo do BAN
 DeleteARib=Excluir registro de BAN
 ConfirmDeleteRib=Você tem certeza que deseja excluir este registro BAN?
-RejectCheck=Cheque devolvido
 ConfirmRejectCheck=Você tem certeza que deseja marcar este cheque como recusado?
 RejectCheckDate=Data que o cheque foi devolvido
-CheckRejected=Cheque devolvido
-CheckRejectedAndInvoicesReopened=Cheque devolvido e faturas reabertas
 BankAccountModelModule=Temas de documentos para as contas bancárias.
 DocumentModelSepaMandate=Tema do mandato SEPA. Útil somente para os países europeus na Comunidade Europeia.
 DocumentModelBan=Tema para imprimir a página com a informação BAN.
-NewVariousPayment=Novos pagamentos diversos
-ShowVariousPayment=Mostrar pagamentos diversos
-AddVariousPayment=Adicionar pagamentos diversos
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
 FindYourSEPAMandate=Este é o seu mandato da SEPA (Área Única de Pagamentos em Euros) para autorizar a nossa empresa a fazer uma ordem de débito direto para o seu banco. Obrigado em devolvê-lo assinado (digitalização do documento assinado) ou enviado por correio para
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index bee5a02eaad..a4e10bb560e 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -46,7 +46,6 @@ SupplierBills=Faturas de fornecedores
 PaymentBack=Reembolso de pagamento
 CustomerInvoicePaymentBack=Reembolso de pagamento
 PaymentsBack=Reembolsos de pagamentos
-paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolso pago
 DeletePayment=Deletar pagamento
 ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
@@ -61,8 +60,6 @@ PaymentsBackAlreadyDone=Reembolsos de pagamentos já feitos
 PaymentRule=Regra de pagamento
 PaymentMode=Forma de Pagamento
 PaymentTypeDC=Cartão de débito / crédito
-IdPaymentMode=Tipo de pagamento (id)
-CodePaymentMode=Tipo de pagamento (código)
 LabelPaymentMode=Tipo de pagamento (rótulo)
 PaymentModeShort=Forma de Pagamento
 PaymentTerm=Termo de pagamento
@@ -196,14 +193,11 @@ SendBillByMail=Enviar a fatura por e-mail
 SendReminderBillByMail=Enviar o restante por e-mail
 RelatedRecurringCustomerInvoices=Faturas recorrentes relacionadas ao cliente
 MenuToValid=Validar
-DateMaxPayment=Pagamento devido em
-DatePointOfTax=Ponto de imposto
 ClassifyBill=Classificar fatura
 SupplierBillsToPay=Faturas de fornecedores não pagos
 CustomerBillsUnpaid=Faturas de clientes não pagos
 SetConditions=Definir condições de pagamento
 SetRevenuStamp=Definir o selo da receita
-RecurringInvoices=Faturas recorrentes
 RepeatableInvoice=Fatura pré-definida
 RepeatableInvoices=Faturas pré-definidas
 Repeatable=Pré-definida
@@ -220,7 +214,6 @@ ReductionShort=Redução
 Reductions=Reduções
 ReductionsShort=Reduções
 AddDiscount=Criar desconto
-AddGlobalDiscount=Criar desconto fixo
 EditGlobalDiscounts=Editar desconto fixo
 ShowDiscount=Mostrar desconto
 ShowReduc=Mostrar o desconto
@@ -232,9 +225,6 @@ Deposits=Depósitos
 DiscountFromCreditNote=Desconto de nota de crédito %s
 DiscountFromDeposit=Pagamentos a partir de depósito na fatura %s
 AbsoluteDiscountUse=Esse tipo de crédito pode ser usado na fatura antes da validação
-CreditNoteDepositUse=A fatura deve ser validada para utilizar este tipo de crédito
-NewGlobalDiscount=Novo desconto fixo
-NewRelativeDiscount=Novo desconto relativo
 DiscountOfferedBy=Concedido por
 BillAddress=Endereço de cobrança
 HelpEscompte=Esse desconto é um desconto concedido para cliente porque o pagamento foi feito antes do prazo.
@@ -258,32 +248,25 @@ ConfirmSplitDiscount=Você tem certeza que deseja dividir este desconto de <b>%s
 TypeAmountOfEachNewDiscount=Quantia entrada para cada de duas partes:
 TotalOfTwoDiscountMustEqualsOriginal=Total dos dois descontos deve ser igual ao desconto original.
 ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
-RelatedCustomerInvoices=Faturas de clientes relacionadas
 RelatedSupplierInvoices=Faturas de fornecedores relacionados
 LatestRelatedBill=Últimas fatura correspondente
 WarningBillExist=Atenção, um ou mais fatura já existem
 MergingPDFTool=Mesclando ferramenta PDF
 AmountPaymentDistributedOnInvoice=Valor do pagamento distribuído na fatura
 PaymentOnDifferentThirdBills=Permitir pagamentos em diferentes notas de terceiros, mas de uma mesma companhia mãe
-PaymentNote=Nota de pagamento
 ListOfPreviousSituationInvoices=Lista de faturas na situação anterior
 ListOfNextSituationInvoices=Lista das faturas na próxima situação
 FrequencyPer_d=A cada %s dias
 FrequencyPer_m=A cada %s meses
 FrequencyPer_y=A cada %s anos
-FrequencyUnit=Unidade de frequência
 toolTipFrequency=Exemplos: <br> <b> fixar 7, Day </b>: dê uma nova fatura a cada 7 dias <br> <b> Set 3, Month </b>: dê uma nova fatura a cada 3 meses
-NextDateToExecution=Data para a próxima geração de fatura
 NextDateToExecutionShort=Data da próxima geração.
-DateLastGeneration=Data da última geração
 DateLastGenerationShort=Data da última geração.
 InvoiceAutoValidate=Validar as faturas automaticamente
 GeneratedFromRecurringInvoice=Gerar a partir do tem de fatura recorrente %s
 DateIsNotEnough=Data ainda não alcançada
 InvoiceGeneratedFromTemplate=Fatura %s gerada a partir do tema de fatura recorrente %s
 WarningInvoiceDateInFuture=Atenção, a data da fatura é superior à data atual
-WarningInvoiceDateTooFarInFuture=Atenção, a data da fatura está muito longe da data atual
-ViewAvailableGlobalDiscounts=Ver descontos disponíveis
 PaymentConditionShortRECEP=Após o recebimento
 PaymentConditionRECEP=Após o recebimento
 PaymentConditionShort30DENDMONTH=30 dias do fim do mês
@@ -293,14 +276,6 @@ PaymentCondition60DENDMONTH=Dentro de 60 dias após o fim do mês
 PaymentConditionShortPT_DELIVERY=Na entrega
 PaymentConditionPT_ORDER=No pedido
 PaymentConditionPT_5050=50%% adiantado e 50%% na entrega
-PaymentConditionShort10D=10 dias
-PaymentCondition10D=10 dias
-PaymentConditionShort10DENDMONTH=10 dias do final do mês
-PaymentCondition10DENDMONTH=Dentro de 10 dias após o final do mês
-PaymentConditionShort14D=14 dias
-PaymentCondition14D=14 dias
-PaymentConditionShort14DENDMONTH=14 dias do final do mês
-PaymentCondition14DENDMONTH=Dentro de 14 dias após o final do mês
 FixAmount=Corrigir valor
 VarAmount=Variavel valor (%% total)
 PaymentTypePRE=Pedido com pagamento em Débito direto
@@ -311,8 +286,6 @@ PaymentTypeTIP=TIP (Documentos contra Pagamento)
 PaymentTypeShortTIP=Pagamento TIP
 PaymentTypeTRA=Cheque administrativo
 PaymentTypeShortTRA=Minuta
-PaymentTypeFAC=Fator
-PaymentTypeShortFAC=Fator
 BankDetails=Detalhes bancário
 BankCode=Código bancário
 DeskCode=Código de mesa
@@ -354,7 +327,6 @@ ChequesReceipts=Recibos de cheques
 ChequesArea=Área de cheques depositados
 ChequeDeposits=depósitos de cheques
 DepositId=Depósito Id
-NbCheque=Número de cheques
 CreditNoteConvertedIntoDiscount=Este %s foi convertido em %s
 UsBillingContactAsIncoiveRecipientIfExist=Usar o endereço do contato de faturamento do cliente ao invés do endereço de terceiro como recibo das faturas
 ShowUnpaidAll=Mostras todas as faturas não pagas
@@ -389,7 +361,6 @@ TypeContact_facture_external_SERVICE=Contato de serviço de cliente
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Representativo seguido de fatura de fornecedor
 TypeContact_invoice_supplier_external_BILLING=Contato de fatura de fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Contato de envio de fornecedor
-TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 InvoiceFirstSituationAsk=Primeira situação da fatura
 InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
 InvoiceSituation=Situação da fatura
@@ -407,7 +378,6 @@ PDFCrevetteSituationNumber=Situação Nº %s
 PDFCrevetteSituationInvoiceLineDecompte=Situação da fatura - CONTAR
 PDFCrevetteSituationInvoiceTitle=Situação da fatura
 PDFCrevetteSituationInvoiceLine=Situação Nº %s : Fat. Nº %s em %s
-TotalSituationInvoice=Situação total
 invoiceLineProgressError=A linha de progresso da fatura não pode ser maior ou igual à próxima linha da fatura
 updatePriceNextInvoiceErrorUpdateline=Erro : atualizar preço na linha da fatura : %s
 ToCreateARecurringInvoice=Para criar uma fatura recorrente para este contrato, crie primeiro este rascunho de fatura, converta-a em um tema de fatura e defina então a frequência de geração das próximas faturas.
@@ -415,8 +385,6 @@ ToCreateARecurringInvoiceGene=Para gerar as futuras faturas regular e manualment
 ToCreateARecurringInvoiceGeneAuto=Se você deseja ter tais faturas sendo geradas automaticamente, peça ao seu Administrador para habilitar e configurar o módulo <strong>%s</strong>. Note que ambos os métodos (manual e automático) podem ser usados em conjunto sem o risco de duplicação.
 DeleteRepeatableInvoice=Excluir tema de fatura
 ConfirmDeleteRepeatableInvoice=Você tem certeza que deseja excluir o tema de fatura?
-CreateOneBillByThird=Crie uma fatura por terceiro (caso contrário, uma fatura por pedido)
 BillCreated=%s conta(s) criada(s)
 StatusOfGeneratedDocuments=Status da geração de documentos
 DoNotGenerateDoc=Não gere arquivo de documento
-AutogenerateDoc=Auto gerar arquivo de documento
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
new file mode 100644
index 00000000000..35e2dc8dd37
--- /dev/null
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -0,0 +1,53 @@
+BlockedLog=Logs nao modificaveis
+Field=Campo
+BlockedLogDesc=Este módulo rastreia alguns eventos em um log inalterável (que você não pode modificar uma vez gravado) em uma cadeia de blocos, em tempo real. Este módulo fornece compatibilidade com os requisitos das leis de alguns países (como a França com a lei Finança 2016 - Norma NF535).
+Fingerprints=Eventos e impressoes digitais arquivados
+FingerprintsDesc=Esta é a ferramenta para procurar ou extrair os logs inalteráveis. Logs inalteráveis são gerados e arquivados localmente em uma tabela dedicada, em tempo real, quando você registra um evento de negócios. Você pode usar essa ferramenta para exportar esse arquivo e salvá-lo em um suporte externo (alguns países, como a França, pedem que você faça isso todos os anos). Note que, não há nenhum recurso para limpar este log e todas as mudanças tentadas ser feitas diretamente neste log (por um hacker, por exemplo) serão reportadas com uma impressão digital não válida. Se você realmente precisar limpar essa tabela porque usou seu aplicativo para fins de demonstração / teste e deseja limpar seus dados para iniciar sua produção, peça ao seu revendedor ou integrador para redefinir seu banco de dados (todos os seus dados serão removidos).
+CompanyInitialKey=Chave inicial da empresa (hash do bloco genesis)
+BrowseBlockedLog=Logs nao modificaveis
+ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
+ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
+DownloadBlockChain=Baixar impressoes digitais
+KoCheckFingerprintValidity=O log arquivado não é válido. Isso significa que alguém (um hacker?) Modificou alguns dados desse registro arquivado depois que foi gravado ou apagou o registro arquivado anterior (verifique se a linha com o número anterior existe).
+OkCheckFingerprintValidity=O log arquivado é válido. Isso significa que todos os dados nesta linha não foram modificados e o registro segue o gravado anteriormente.
+OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
+AddedByAuthority=Salvo na autoridade remota
+NotAddedByAuthorityYet=Ainda não armazenado em autoridade remota
+ShowDetails=Mostrar detalhes salvos
+logPAYMENT_VARIOUS_CREATE=Pagamento (nao vinculado com a fatura) criado
+logPAYMENT_VARIOUS_MODIFY=Pagamento (nao vinculado com a fatura) modificado
+logPAYMENT_VARIOUS_DELETE=Pagamento (nao vinculado com a fatura) delete logico
+logPAYMENT_ADD_TO_BANK=Pagamento adicionado ao banco
+logPAYMENT_CUSTOMER_CREATE=Pagamento do cliente criado
+logPAYMENT_CUSTOMER_DELETE=Exclusão lógica de pagamento do cliente
+logDONATION_PAYMENT_CREATE=Pagamento de doação criado
+logDONATION_PAYMENT_DELETE=Exclusão lógica de pagamento de doação
+logBILL_PAYED=Fatura do cliente paga
+logBILL_UNPAYED=Conjunto de faturas do cliente não pago
+logBILL_VALIDATE=Fatura de cliente confirmada
+logBILL_SENTBYMAIL=Fatura do cliente enviada por email
+logBILL_DELETE=Fatura do cliente excluída logicamente
+logMODULE_RESET=O módulo BlockedLog foi desativado
+logMODULE_SET=O módulo BlockedLog foi ativado
+logDON_VALIDATE=Doação validada
+logDON_MODIFY=Doação modificada
+logDON_DELETE=Exclusão lógica de doação
+logMEMBER_SUBSCRIPTION_CREATE=Inscrição de membro criada
+logMEMBER_SUBSCRIPTION_MODIFY=Inscrição de membro modificada
+logMEMBER_SUBSCRIPTION_DELETE=Exclusão lógica de assinatura de membro
+BlockedLogBillDownload=Download da fatura do cliente
+BlockedLogBillPreview=Pré-visualização da fatura do cliente
+BlockedlogInfoDialog=Detalhes do log
+ListOfTrackedEvents=Lista de eventos rastreados
+Fingerprint=Impressao digial
+DownloadLogCSV=Exportar logs arquivados (CSV)
+logDOC_PREVIEW=Pré -visualização de um documento validado para imprimir ou baixar
+logDOC_DOWNLOAD=Download de um documento validado para imprimir ou enviar
+DataOfArchivedEvent=Dados completos do evento arquivado
+ImpossibleToReloadObject=Objeto original (tipo %s, id %s) não vinculado (consulte a coluna 'Dados completos' para obter dados salvos inalterados)
+BlockedLogAreRequiredByYourCountryLegislation=O módulo Logs Inalteráveis ​​pode ser exigido pela legislação do seu país. Desabilitar este módulo pode invalidar quaisquer transações futuras com relação à lei e ao uso de software legal, já que elas não podem ser validadas por uma auditoria fiscal.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo Logs Inalteráveis ​​foi ativado por causa da legislação do seu país. A desativação deste módulo pode invalidar quaisquer transações futuras com relação à lei e ao uso de software legal, já que elas não podem ser validadas por uma auditoria fiscal.
+BlockedLogDisableNotAllowedForCountry=Lista de países onde o uso deste módulo é obrigatório (apenas para evitar desabilitar o módulo por erro, se o seu país estiver nesta lista, desabilitar o módulo não é possível sem primeiro editar esta lista. Note também que habilitar / desabilitar este módulo irá manter uma faixa no log inalterável).
+OnlyNonValid=Nao valido
+TooManyRecordToScanRestrictFilters=Muitos registros para digitalizar / analisar. Por favor, restrinja a lista com filtros mais restritivos.
+RestrictYearToExport=Limitar mes / ano a se exportar
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index da0e207997a..a0fb7ab48ed 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -44,7 +44,6 @@ Zip=CEP
 Town=Município
 Web=Website
 DefaultLang=Padrão de idioma
-VATIsUsed=Imposto sobre vendas usado
 VATIsNotUsed=O imposto sobre vendas não é usado
 CopyAddressFromSoc=Preencher o endereço com os dados do terceiro
 PaymentBankAccount=Pagamento conta bancária
@@ -180,10 +179,8 @@ DeleteFile=Excluir arquivo
 ConfirmDeleteFile=Você tem certeza que deseja deletar esse arquivo?
 AllocateCommercial=Designado para representante comercial
 Organization=Organização
-FiscalYearInformation=Ano fiscal
 FiscalMonthStart=Primeiro mês do ano fiscal
 YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
-ListCustomersShort=Lista de Clientes
 ActivityCeased=Inativo
 ThirdPartyIsClosed=O terceiro está fechado
 ProductsIntoElements=Lista de produtos/serviços em %s
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index ac9ed1e681b..0d8031b257a 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -58,7 +58,6 @@ TypeContrib=Tipo de contribuição
 MenuSpecialExpenses=Despesas especiais
 MenuSocialContributions=Contribuições fiscais/sociais
 NewSocialContribution=Nova contribuição fiscal/social
-AddSocialContribution=Adicionar imposto social / fiscal
 ContributionsToPay=Encargos sociais / fiscais para pagar
 PaymentCustomerInvoice=Pagamento de fatura de cliente
 PaymentSocialContribution=Pagamento de imposto social / fiscal
@@ -80,7 +79,6 @@ LT2PaymentsES=Pagamentos de IRPF
 VATPayment=Pagamento da taxa de venda
 VATPayments=Pagamentos da taxa de venda
 VATRefund=Reembolso da taxa sobre vendas
-Refund=Reembolso
 SocialContributionsPayments=Pagamentos de impostos sociais / fiscais
 ShowVatPayment=Ver Pagamentos ICMS
 TotalToPay=Total a pagar
@@ -94,11 +92,8 @@ ByThirdParties=Por Fornecedor
 CheckReceipt=Depósito de cheque
 CheckReceiptShort=Depósito de cheque
 LastCheckReceiptShort=Últimos %s recibos de cheque
-NewCheckReceipt=Novo desconto
-NewCheckDeposit=Novo depósito de cheque
 NoWaitingChecks=Sem cheques a depositar.
 DateChequeReceived=Data introdução de dados de recepção cheque
-NbOfCheques=Nº de cheques
 PaySocialContribution=Quitar um encargo fiscal/social
 ConfirmPaySocialContribution=Quer mesmo categorizar esta contribuição fiscal/social como paga?
 DeleteSocialContribution=Excluir um pagamento taxa social ou fiscal
@@ -148,7 +143,6 @@ DescPurchasesJournal=Diário de  Compras
 CodeNotDef=Não Definida
 DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição
 Pcg_version=Modelos de carta de contas
-Pcg_type=Tipo Pcg
 Pcg_subtype=PCG subtipo
 InvoiceLinesToDispatch=Linhas de nota fiscal para envio
 RefExt=Ref externo
@@ -172,6 +166,3 @@ SameCountryCustomersWithVAT=Informar os clientes nacionais
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Com base nas duas primeiras letras do número de IVA sendo o mesmo que o código do país da sua própria empresa
 LinkedFichinter=Vincular a uma intervenção
 ImportDataset_tax_contrib=Contribuições fiscais/sociais
-ImportDataset_tax_vat=Pagamentos de IVA
-ErrorBankAccountNotFound=Erro: conta bancária não encontrada
-ListSocialContributionAssociatedProject=Lista de contribuições sociais associadas ao projeto
diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang
index 5b29464fbbf..9f16c42805e 100644
--- a/htdocs/langs/pt_BR/dict.lang
+++ b/htdocs/langs/pt_BR/dict.lang
@@ -32,7 +32,6 @@ CountryML=Máli
 CountryMM=Birmânia (Myanmar)
 CountryNC=Nova Caledônia
 CountryPS=Território Palestino, Ocupado
-CountryPG=Papua-Nova Guiné
 CountryPN=Ilhas Picárnia
 CountryKN=São Cristóvão e Nevis
 CountryPM=São Pedro e Miquelon
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 7b00b4ae4f3..02a74294e4b 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -30,7 +30,6 @@ ErrorWrongDate=A data não está correta!
 ErrorFailedToWriteInDir=Houve uma falha ao escrever no diretório %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorreta em email em %s linhas em Arquivo (Exemplo linha %s com email
 ErrorFieldsRequired=Alguns campos obrigatórios não foram preenchidos.
-ErrorSubjectIsRequired=O tópico do email é obrigatório
 ErrorFailedToCreateDir=Error na creação de uma carpeta. Compruebe que 0 usuario del servidor Web tiene derechos de escritura en las carpetas de documentos de Dolibarr. Si 0  parámetro <b>safe_mode</b> está ativo en este PHP, Compruebe que los archivos php dolibarr pertencen ao usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=Nenhum e-mail definido para este usuário
 ErrorFeatureNeedJavascript=Esta funcionalidade requer que o javascript seja ativado para funcionar. Altere isto em Configuração >> Aparência.
@@ -55,7 +54,6 @@ ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não ativado
 ErrorExportDuplicateProfil=Este nome de perfil já existe para este lote de exportação.
 ErrorLDAPSetupNotComplete=A correspondência Dolibarr-LDAP não está completa.
 ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error.
-ErrorCantSaveADoneUserWithZeroPercentage=Não é possível salvar uma ação com "status não iniciado" se o campo "concluído por" também estiver preenchido.
 ErrorRefAlreadyExists=A ref. utilizada para a criação já existe.
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
 ErrorPasswordsMustMatch=Deve existir correspondência entre as senhas digitadas
@@ -71,7 +69,6 @@ ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência
 ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim
 ErrorMaxNumberReachForThisMask=Número máximo de alcance para essa máscara
 ErrorCounterMustHaveMoreThan3Digits=Contador deve ter mais de 3 dígitos
-ErrorDeleteNotPossibleLineIsConsolidated=Excluir não é possível porque o registro está vinculado a uma transação bancária conciliada
 ErrorProdIdAlreadyExist=%s é atribuído a outro terço
 ErrorFailedToSendPassword=Houve uma falha no envio da senha
 ErrorForbidden=Acesso negado. <br> Você tenta acessar a uma página, área ou característica de um módulo desativado ou sem estar em uma sessão autenticada ou que não é permitido para o usuário.
@@ -79,7 +76,6 @@ ErrorForbidden2=Os permissões para este usuário podem ser designados por o adm
 ErrorForbidden3=Dolibarr não parece funcionar em uma Sessão autentificada. Consulte a documentação de Instalação de Dolibarr para saber cómo administrar as autenticaciones (htaccess, mod_auth u outro...).
 ErrorNoImagickReadimage=a função imagick_readimage não está presente nesta Instalação de PHP. a resenha não está pois disponível. Os administradores podem desativar esta separador ao menu configuração - visualização.
 ErrorRecordAlreadyExists=O registro já existe
-ErrorLabelAlreadyExists=Esta etiqueta já existe
 ErrorCantReadFile=Houve uma falha ao ler o arquivo '%s'
 ErrorCantReadDir=Houve uma falha ao ler o diretório '%s'
 ErrorBadLoginPassword=Identificadores de usuário o senha incorretos
@@ -95,7 +91,6 @@ ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para exec
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
 ErrUnzipFails=Houve uma falha ao descompactar %s com ZipArchive
 ErrorFileMustBeADolibarrPackage=O arquivo %s deve ser um pacote zipado do Dolibarr
-ErrorModuleFileRequired=Você deve selecionar um arquivo de pacote do módulo Dolibarr
 ErrorPhpCurlNotInstalled=O PHP CURL não está instalado, isto é essencial para conversar com Paypal
 ErrorFailedToAddToMailmanList=Falha ao adicionar registro% s para% s Mailman lista ou base SPIP
 ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman lista ou base SPIP
@@ -114,40 +109,21 @@ ErrorPriceExpression1=Não é possível atribuir a constante %s'
 ErrorPriceExpression2=Não é possível redefinir a função built-in '%s'
 ErrorPriceExpression3=variavel não definida '%s' na definição de função
 ErrorPriceExpression4=Caractere ilegal '%s'
-ErrorPriceExpression5=Inesperado '%s'
 ErrorPriceExpression6=Número errado de argumentos (fornecidos %s, esperados %s)
 ErrorPriceExpression8=Operador Inesperado '%s'
-ErrorPriceExpression9=Ocorreu um erro inesperado
-ErrorPriceExpression11=Esperando '%s'
-ErrorPriceExpression14=Divisão por zero
 ErrorPriceExpression17=Variável não definida '%s'
-ErrorPriceExpression19=Expressão não encontrada
-ErrorPriceExpression20=Expressão vazia
-ErrorPriceExpression21=Resultado vazio '%s'
-ErrorPriceExpression22=Resultado negativo '%s'
-ErrorPriceExpressionInternal=Erro interno '%s'
-ErrorPriceExpressionUnknown=Erro desconhecido '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Origem e de destino de armazéns devem ser diferentes
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas as recepções gravados primeiro deve ser verificada (aprovada ou negada) antes de serem autorizados a fazer esta ação
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas as recepções gravadas primeiro devem ser verificada (aprovado) antes de serem autorizados a fazer esta ação
 ErrorGlobalVariableUpdater0=Pedido HTTP falhou com o erro '%s'
-ErrorGlobalVariableUpdater1=Formato JSON inválido '%s'
 ErrorGlobalVariableUpdater2=Faltando parâmetro '%s'
-ErrorGlobalVariableUpdater3=Os dados solicitados não foram encontrados no resultado
-ErrorGlobalVariableUpdater4=Cliente SOAP falhou com o erro '%s'
 ErrorGlobalVariableUpdater5=Nenhuma variável global selecionado
 ErrorFieldMustBeANumeric=O campo <b>%s</b> deve ser um valor numérico
 ErrorMandatoryParametersNotProvided=Parâmetro (s) de preenchimento obrigatório não fornecidas
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Má definição da matriz Menu No Módulo Descritor (mau valor para fk_menu chave)
-ErrorSavingChanges=Ocorreu um erro ao salvar as alterações
 ErrorWarehouseRequiredIntoShipmentLine=É exigido um armazém na linha para a remessa
-ErrorFileMustHaveFormat=O arquivo deve ter o formato %s
 ErrorsThirdpartyMerge=Falha em mesclar os dois registros. Solicitação cancelada.
 ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
-ErrorTaskAlreadyAssigned=Tarefa já atribuída ao usuário
-ErrorNoWarehouseDefined=Erro, nenhum armazém definido.
-ErrorTooManyErrorsProcessStopped=Muitos erros. Processo foi parado.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Somente faturas validadas podem ser enviadas usando a ação em massa "Enviar por e-mail".
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
 WarningMandatorySetupNotComplete=Há parâmetros de configuração obrigatórios ainda não definidos
 WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
@@ -164,4 +140,3 @@ WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior a da
 WarningTooManyDataPleaseUseMoreFilters=Dados em demasia (mais de %s linhas). Por favor, utilize mais filtros ou defina a constante %s para um limite maior.
 WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns usuários enquanto sua taxa por hora não foi definida. Um valor de 0 %s por hora foi usado, mas isto pode resultar em uma valoração errada do tempo gasto.
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
-WarningDateOfLineMustBeInExpenseReportRange=Atenção, a data da linha não está no intervalo do relatório de despesas
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index 92be724e94d..f5c46f59379 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -150,7 +150,6 @@ MigrationDeliveryDetail=Entrega atualizada
 MigrationStockDetail=Atualizar valores do estoque dos produtos
 MigrationMenusDetail=Atualize menus das tabelas dinâmicas
 MigrationDeliveryAddress=Atualizar o endereço de entrega nos envios
-MigrationProjectTaskActors=Migração de dados para a tabela llx_projet_task_actors
 MigrationProjectUserResp=Dados da migração do campo fk_user_resp de llx_projet para llx_element_contact
 MigrationProjectTaskTime=Atualizar tempo gasto em segundos
 MigrationActioncommElement=Atualizar dados nas ações
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 9432eec082b..6d44de2bb40 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -31,7 +31,6 @@ CloneEMailing=Clonar e-mailing
 ConfirmCloneEMailing=Você tem certeza que deseja clonar esta lista de e-mails?
 CloneContent=Clonar mensagem
 CloneReceivers=Clonar recebidores
-DateLastSend=Data do último envio
 DateSending=Data envio
 YourMailUnsubcribeOK=O e-mail <b>%s</b> foi removido com sucesso da lista
 ActivateCheckReadKey=Chave usada para criptografar URL usado para "confirmação de leitura" e recurso "Unsubcribe"
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index a5f3383c627..5c78d471f7c 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -4,7 +4,6 @@ MarkRate=Relação margem-preço de venda
 DisplayMarginRates=Exibir relações margem-preço de compra
 DisplayMarkRates=Exibir relações margem-preço de venda
 InputPrice=Preço de entrada
-margin=Gestão de margens de lucro
 margesSetup=Configuração das margens de lucro
 ProductMargins=Margens de produtos
 CustomerMargins=Margems de clientes
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index c75a753181a..783902b7405 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -39,7 +39,6 @@ SubscriptionLate=Atraso
 SubscriptionNotReceived=filiação não recibida
 ListOfSubscriptions=Lista de Filiações
 SendCardByMail=Enviar ficha por E-mail
-AddMember=Criar membro
 NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 DeleteType=Excluir
 Physical=Físico
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
new file mode 100644
index 00000000000..e1d4756199d
--- /dev/null
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+EnterNameOfModuleDesc=Digite o nome do módulo / aplicativo para criar sem espaços. Use letras maiúsculas para separar palavras (por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
+ModuleBuilderDesc2=Caminho onde os módulos são gerados / editados (primeiro diretório alternativo definido em %s): <strong> %s </ strong>
+ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong> %s </ strong>
+ModuleBuilderDescmenus=Esta guia é dedicada a definir as entradas do menu fornecidas pelo seu módulo.
+ModuleBuilderDescpermissions=Essa guia é dedicada para definir as novas permissões que você deseja fornecer com seu módulo.
+ModuleBuilderDesctriggers=Esta é a visão dos gatilhos fornecidos pelo seu módulo. Para incluir o código executado quando um evento de negócios acionado é iniciado, basta editar esse arquivo.
+ModuleBuilderDeschooks=Esta aba é dedicada aos ganchos.
+ModuleBuilderDescwidgets=Esta aba é dedicada a gerenciar / construir widgets.
+ModuleBuilderDescbuildpackage=Você pode gerar aqui um arquivo de pacote "pronto para distribuir" (um arquivo .zip normalizado) do seu módulo e um arquivo de documentação "pronto para distribuir". Basta clicar no botão para criar o pacote ou arquivo de documentação.
+BuildPackage=Criar pacote / documentação
+BuildDocumentation=Documentação de compilação
+ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode interromper um recurso ativo atual.
+DescriptionLong=Longa descrição
+DescriptorFile=Arquivo descritor do módulo
+ApiClassFile=Arquivo para classe API do PHP
+PageForList=Página PHP para lista de registro
+PageForCreateEditView=Página PHP para criar / editar / visualizar um registro
+PathToModulePackage=Caminho para o zip do pacote de módulo / aplicativo
+PathToModuleDocumentation=Caminho para o arquivo da documentação do módulo / aplicativo
+FileNotYetGenerated=Arquivo ainda não gerado
+DatabaseIndex=Índice do banco de dados
+AddLanguageFile=Adicionar arquivo de idioma
diff --git a/htdocs/langs/pt_BR/multicurrency.lang b/htdocs/langs/pt_BR/multicurrency.lang
new file mode 100644
index 00000000000..de85eb11dc4
--- /dev/null
+++ b/htdocs/langs/pt_BR/multicurrency.lang
@@ -0,0 +1,15 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi Moeda
+ErrorDeleteCurrencyFail=Erro ao excluir falha
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use a data do documento para encontrar a taxa de câmbio, em vez de usar a taxa conhecida mais recente
+multicurrency_useOriginTx=Quando um objeto é criado a partir de outro, mantenha a taxa original do objeto de origem (caso contrário, use a taxa conhecida mais recente)
+CurrencyLayerAccount=API CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Você deve criar uma conta em seu site para usar essa funcionalidade. <br> Obtenha sua <b> chave de API </ b>. <br> Se você usa uma conta gratuita, não é possível alterar a <b> origem da moeda </ b> (USD por padrão). <br> Se sua moeda principal não for USD, você pode usar a <b> fonte de moeda alternativa </ b> para forçar sua moeda principal. <br> <br> Você está limitado a 1000 sincronizações por mês.
+multicurrency_appId=Chave API
+multicurrency_appCurrencySource=Moeda corrente
+CurrenciesUsed=Moedas utilizadas
+CurrenciesUsed_help_to_add=Adicione as diferentes moedas e taxas que você precisa usar nas suas <b> propostas </ b>, <b> ordens </ b> etc.
+MulticurrencyReceived=Moeda original recebida
+MulticurrencyRemainderToTake=Quantia restante, moeda original
+MulticurrencyPaymentAmount=Valor do pagamento, moeda original
+AmountToOthercurrency=Quantia para (na moeda da conta receptora)
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 24db0fb3403..f997ea2f9fb 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -7,8 +7,6 @@ ProductNoteTranslated=Nota produto traduzido
 ProductServiceCard=Ficha do produto/serviço
 ProductId=ID do produto/serviço
 Reference=Referência
-NewProduct=Novo produto
-NewService=Novo serviço
 ProductVatMassChange=Mudança VAT Massa
 ProductVatMassChangeDesc=Esta página pode ser utilizado para modificar uma taxa VAT definido em produtos ou serviços a partir de um valor para outro. Atenção, esta mudança é feita em todos os banco de dados.
 MassBarcodeInit=Inicialização de código de barras.
@@ -30,7 +28,6 @@ ProductStatusNotOnBuy=Não para-se comprar
 ProductStatusNotOnBuyShort=Não para-se comprar
 UpdateVAT=Atualização IVA
 UpdateDefaultPrice=Atualização de preço padrão
-UpdateLevelPrices=Atualizar preços para cada nível
 SellingPriceHT=Preço de venda (sem taxas)
 SellingPriceTTC=Preço de venda (incl. taxas)
 CostPriceDescription=Este preço ( livre de impostos) pode ser usado para armazenar a quantidade média do custo do produto para sua empresa. Pode ser qualquer preço a se calcular, por exemplo, a partir do preço médio de compra mais o custo médio de produção e distribuição.
@@ -41,7 +38,6 @@ CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para
 ContractStatusClosed=Encerrado
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
-ErrorPriceCantBeLowerThanMinPrice=Erro, o preço não pode ser inferior ao preço mínimo.
 SupplierCard=Ficha do fornecedor
 NoteNotVisibleOnBill=Nota (não visivel em faturas, orçamentos etc.)
 MultiPricesAbility=Varias faixas de preços de produtos/serviços por segmento (cada cliente está em um segmento)
@@ -68,7 +64,6 @@ PredefinedProductsToSell=Produtos pré-definidas para vender
 PredefinedServicesToSell=Serviços predefinidos para vender
 PredefinedProductsAndServicesToSell=Produtos / serviços pré-definidas para vender
 PredefinedProductsToPurchase=Produto pré-definidas para compra
-PredefinedServicesToPurchase=Serviços pré-definidos para compra
 PredefinedProductsAndServicesToPurchase=Produtos / serviços predefinidos para compra.
 NotPredefinedProducts=Produtos/Serviços sem predefinição
 ServiceNb=Serviço n� %s
@@ -82,7 +77,6 @@ ConfirmCloneProduct=Você tem certeza que deseja clonar o produto ou serviço <b
 CloneContentProduct=Clonar todas as principais informações de um produto/serviço
 CloneCompositionProduct=Clone pacote de produto / serviço
 ProductIsUsed=Este produto é usado
-NewRefForClone=Ref. do novo produto/serviço
 SellingPrices=Preços para Venda
 BuyingPrices=Preços para Compra
 CustomerPrices=Preços de cliente
@@ -127,7 +121,6 @@ BarCodeDataForThirdparty=Informação do código de barras do terceiro %s :
 ResetBarcodeForAllRecords=Definir o valor do código de barras para todos os registros (isto também redefinirá o valor do código de barras já definido com novos valores)
 PriceByCustomer=Preços diferenteas para cada cliente
 PriceCatalogue=Um único preço de venda por produto/serviço
-PricingRule=Regras para preços de venda
 AddCustomerPrice=Adicionar preço por cliente
 ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
 PriceByCustomerLog=Registros de preços de cliente anteriores
@@ -139,17 +132,13 @@ PriceExpressionEditorHelp1="Preço = 2 + 2" ou "2 + 2" para fixação do preço.
 PriceExpressionEditorHelp2=Você pode acessar ExtraFields com variáveis como <b>#extrafield_myextrafieldkey#</b> e variáveis globais com o <b>#global_mycode #</b>
 PriceExpressionEditorHelp3=Em ambos produtos/serviços e fornecedores nesses preços há essas variáveis disponíveis:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=No preço do produto/serviço apenas: <b>#supplier_min_price#</b><br>Em apenas preços com fornecedores: <b>#supplier_quantity# e #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Valores globais disponíveis:
 PriceMode=Modo de Preço
 DefaultPrice=Preço padrão
 ComposedProductIncDecStock=Aumento/diminuição do estoque, armazém, atual
 ComposedProduct=Sub-produto
 MinSupplierPrice=Preco de compra minimo
 DynamicPriceConfiguration=Configuração de preço dinâmico
-AddVariable=Adicionar Variável
-AddUpdater=Adicionar atualizador
 GlobalVariables=As variáveis ​​globais
-VariableToUpdate=Variável para atualizar
 GlobalVariableUpdaters=Updaters variáveis ​​globais
 GlobalVariableUpdaterHelp0=Analisa os dados JSON de URL especificada, valor especifica a localização de valor relevante,
 GlobalVariableUpdaterType1=Dados WebService
@@ -158,12 +147,9 @@ PropalMergePdfProductActualFile=Usar arquivos para adicionar em PDF Azur são /
 PropalMergePdfProductChooseFile=Selecione os arquivos PDF
 IncludingProductWithTag=Incluindo produto/serviço com tag
 DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, o preço real pode depender do cliente
-WarningSelectOneDocument=Por favor, selecione pelo menos um documento
 NbOfQtyInProposals=Qtde nas Propostas
 ClinkOnALinkOfColumn=Clique no link da coluna %s para ter uma visão detalhada...
 TranslatedLabel=Rótulo traduzido
-TranslatedDescription=Descrição traduzida
-TranslatedNote=Notas traduzidas
 ProductWeight=Peso de 1 produto
 ProductVolume=Volume de 1 produto
 WeightUnits=Unidade de Peso
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index a80abe54d73..933376d889b 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -41,7 +41,6 @@ ProgressDeclared=o progresso declarado
 ProgressCalculated=calculado do progresso
 GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
 ListTaskTimeUserProject=Lista de tempo consumido nas tarefas de projecto
-ActivityOnProjectToday=Atividade no projeto hoje
 ActivityOnProjectYesterday=Atividade de ontem no projeto
 ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana
 ActivityOnProjectThisMonth=Atividade ao Projeto este Mês
@@ -90,16 +89,10 @@ TypeContact_project_task_external_TASKEXECUTIVE=Tarefa executada
 SelectElement=Selecionar componente
 AddElement=Link para componente
 PlannedWorkload=carga horária planejada
-PlannedWorkloadShort=Carga de trabalho
 ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
 FirstAddRessourceToAllocateTime=Atribuir o recurso de um usuário à tarefa para alocação do tempo
-InputPerDay=Entrada por dia
-InputPerWeek=Entrada por semana
 ProjectsWithThisUserAsContact=Projetos com este usuário como contato
 TasksWithThisUserAsContact=As tarefas atribuídas a esse usuário
-ResourceNotAssignedToProject=Não atribuído ao projeto
-ResourceNotAssignedToTheTask=Não atribuído à tarefa
-AssignTaskToMe=Atribuir tarefa para mim
 ProjectOverview=Visão geral
 ManageOpportunitiesStatus=Use projetos para acompanhar leads / opportinuties
 ProjectsStatistics=As estatísticas sobre projetos / leads
diff --git a/htdocs/langs/pt_BR/receiptprinter.lang b/htdocs/langs/pt_BR/receiptprinter.lang
index 388cbde764a..30168b70533 100644
--- a/htdocs/langs/pt_BR/receiptprinter.lang
+++ b/htdocs/langs/pt_BR/receiptprinter.lang
@@ -6,7 +6,6 @@ PrinterDeleted=Impressora %s excluída
 TestSentToPrinter=Teste enviado para a impressora %s
 ReceiptPrinterDesc=Configuração das impressoras de recibo
 ReceiptPrinterTemplateDesc=Configuração do Tema
-ReceiptPrinterTypeDesc=Descrição do tipo de Impressora de Recibo
 ReceiptPrinterProfileDesc=Descrição do Perfil da Impressora de Recibo
 SetupReceiptTemplate=Configuração do Tema
 CONNECTOR_DUMMY=Impressora Virtual
diff --git a/htdocs/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang
index 29d52940c8b..b607fdd45c3 100644
--- a/htdocs/langs/pt_BR/sms.lang
+++ b/htdocs/langs/pt_BR/sms.lang
@@ -7,20 +7,15 @@ AllSms=Todas as campnhas SMS
 SmsTargets=Alvos
 SmsRecipients=Alvos
 SmsTopic=Topico do SMS
-ShowSms=Mostrar SMS
 ListOfSms=Listar campanhas SMS
 NewSms=Nova campanha SMS
-EditSms=Editar SMS
 ResetSms=Novo envio
 DeleteSms=Apagar campanha SMS
 DeleteASms=Remover uma campanha SMS
 PreviewSms=Pre-visualizar SMS
 PrepareSms=Preparar SMS
-CreateSms=Criar SMS
 SmsResult=Resultado do envio SMS
 TestSms=Testar SMS
-ValidSms=Validar SMS
-ApproveSms=Aprovar SMS
 SmsStatusNotSent=Nao enviado
 SmsSuccessfulySent=SMS enviado coretamente (de %s a %s)
 ErrorSmsRecipientIsEmpty=Numero de alvos vazio
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index b0ffdcb91e1..ca15a6fe7fe 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
 NewWarehouse=Novo armazém / setor de armazenagem
-MenuNewWarehouse=Novo armazém
 WarehouseSource=Armazém de origem
 WarehouseSourceNotDefined=Nenhum armazém definido,
 WarehouseTarget=Armazém de destino
@@ -21,7 +20,6 @@ NumberOfProducts=Número total de produtos
 CorrectStock=Corrigir estoque
 StockTransfer=Banco de transferência
 TransferStock=Tranferencia de Estoque
-MassStockTransferShort=Transferência de estoque em massa
 StockMovement=Movimento de estoque
 StockMovements=Movimentações de estoque
 UnitPurchaseValue=Preço unitário de compra
@@ -41,8 +39,6 @@ ReStockOnBill=Incrementar os estoques físicos sobre as faturas/recibos
 OrderStatusNotReadyToDispatch=Não tem ordem  ainda não ou nato tem um status que permite envio de produtos em para armazenamento.
 NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária.
 DispatchVerb=Despachar
-StockLimitShort=Limite para alerta
-StockLimit=Limite de estoque para alerta
 PhysicalStock=Estoque físico
 RealStock=Estoque real
 VirtualStock=Estoque virtual
@@ -50,7 +46,6 @@ IdWarehouse=Id. armazenamento
 DescWareHouse=Descrição do armazém
 LieuWareHouse=Localização do armazenamento
 WarehousesAndProducts=Armazenamento de produtos
-WarehousesAndProductsBatchDetail=Armazéns e produtos (com detalhe por lote / série)
 AverageUnitPricePMPShort=Preço médio de entrada
 AverageUnitPricePMP=Preço médio de entrada
 SellPriceMin=Venda Preço unitário
@@ -64,7 +59,6 @@ ThisWarehouseIsPersonalStock=Este armazenamento representa estoque pessoal de:
 SelectWarehouseForStockDecrease=Escolha arquivo para usar a redução estoque
 SelectWarehouseForStockIncrease=Escolha arquivo para usar no aumento de estoque
 NoStockAction=Nenhuma ação de estocagem
-DesiredStock=Estoque ideal desejado
 DesiredStockDesc=Esta quantidade será usada para determinar o estoque a ser reposto.
 StockToBuy=Para encomendar
 Replenishment=Reposição
@@ -73,7 +67,6 @@ VirtualDiffersFromPhysical=De acordo com as opções de estoque ele poderá aume
 UseVirtualStockByDefault=Usar o estoque virtual por padrão, ao invés do estoque físico, como política de estoque
 UseVirtualStock=Usar estoque virtual
 UsePhysicalStock=Usar estoque físico
-CurentSelectionMode=Modo de seleção atual
 CurentlyUsingVirtualStock=Estoque virtual
 CurentlyUsingPhysicalStock=Estoque físico
 RuleForStockReplenishment=Regra para a reposição de estoques
@@ -84,7 +77,6 @@ WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
 ForThisWarehouse=Para este armazenamento
 ReplenishmentStatusDesc=Esta é a lista de todos os produtos que esão abaixo do estoque mínimo (ou  menor que a quantidade de alerta, caso a caixa de seleção "Alerta Apenas" esteja marcada). Usando a caixa de seleção você poderá criar ordens de compra para preencher a diferença.
 ReplenishmentOrdersDesc=Esta é a lista de todas as  Ordens de Compras abertas, incluindo produtos pré-definidos. Somente ordens com produtos pré-definidos que podem alterar o estoque, são visíveies aqui.
-Replenishments=Reabastecimentos
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
 NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
 MassMovement=Movimentações em massa
@@ -104,7 +96,6 @@ MovementTransferStock=Da transferência de produto %s em um outro armazém
 InventoryCodeShort=Código mov./inv.
 NoPendingReceptionOnSupplierOrder=Sem recepção pendente devido a abrir ordem fornecedor
 ThisSerialAlreadyExistWithDifferentDate=Este lote / número de série (<strong>(%s)</strong>) já existe, mas com diferente entradas/saídas (encontrado <strong>%s,</strong> mas você <strong>confirma% s).</strong>
-OpenAll=Aberto para todas as ações
 OptionMULTIPRICESIsOn=A opção "diversos preços por segmento" está habilitada. Isto significa que um produto possui diversos preços de venda, desta forma o valor para venda não pode ser calculado
 ProductStockWarehouseCreated=Limite de estoque para alerta e estoque ótimo desejado corretamente criados
 ProductStockWarehouseUpdated=Limite de estoque para alerta e estoque ótimo desejado corretamente atualizados
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
new file mode 100644
index 00000000000..41c68d747d1
--- /dev/null
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -0,0 +1,290 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Bilhetes
+Module56000Desc=Sistema de bilhetes para gerenciamento de problemas ou solicitações
+
+Permission56001=Veja bilhetes
+Permission56002=Modificar bilhetes
+Permission56003=Excluir bilhetes
+Permission56004=Gerenciar bilhetes
+Permission56005=Veja bilhetes de todos os terceiros (não são efetivos para usuários externos, sempre se limitem ao terceiro que eles dependem)
+
+TicketDictType=Tipo de bilhetes
+TicketDictCategory=Categorias de bilhetes
+TicketDictSeverity=Gravidade dos bilhetes
+TicketTypeShortBUGSOFT=Lógica do sistema de desconexão
+TicketTypeShortBUGHARD=Disfonctionnement matériel
+TicketTypeShortCOM=Questão comercial
+TicketTypeShortINCIDENT=Pedido de assistencia
+TicketTypeShortPROJET=Projeto
+TicketTypeShortOTHER=Outros
+
+TicketSeverityShortLOW=Baixo
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=Alto
+TicketSeverityShortBLOCKING=Crítico / Bloqueio
+
+ErrorBadEmailAddress=Campo '%s' incorreto
+MenuTicketMyAssign=Meus bilhetes
+MenuTicketMyAssignNonClosed=Meus bilhetes abertos
+MenuListNonClosed=Bilhetes abertos
+
+TypeContact_ticket_internal_CONTRIBUTOR=Colaborador
+TypeContact_ticket_internal_SUPPORTTEC=Usuário atribuído
+TypeContact_ticket_external_SUPPORTCLI=Contato com o cliente / acompanhamento de incidentes
+TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
+
+OriginEmail=Fonte de e-mail
+Notify_TICKETMESSAGE_SENTBYMAIL=Enviar resposta do ticket por email
+
+# Status
+NotRead=Não lido
+Read=Ler
+Answered=Respondidas
+Assigned=Atribuído
+InProgress=Em progresso
+Waiting=Aguardando
+Closed=Fechada
+Deleted=Excluído
+
+# Dict
+Type=Tipo
+Category=Categoria
+Severity=Gravidade
+
+# Email templates
+MailToSendTicketMessage=Para enviar email da mensagem do ticket
+
+#
+# Admin page
+#
+TicketSetup=Configuração do módulo de ticket
+TicketSettings=Configurações
+TicketSetupPage=
+TicketPublicAccess=Uma interface pública que não requer identificação está disponível no seguinte url
+TicketSetupDictionaries=O tipo de categorias de aplicativos e o nível de gravidade são configuráveis ​​a partir de dicionários
+TicketParamModule=Configuração da variável do módulo
+TicketParamMail=Configuração de e-mail
+TicketEmailNotificationFrom=E-mail de notificação de
+TicketEmailNotificationFromHelp=Usado na resposta da mensagem do ticket pelo exemplo
+TicketEmailNotificationTo=E-mail de notificações para
+TicketEmailNotificationToHelp=Envie notificações por email para este endereço.
+TicketNewEmailBodyLabel=Mensagem de texto enviada depois de criar um ticket (interface pública)
+TicketNewEmailBodyHelp=O texto especificado aqui será inserido no email confirmando a criação de um novo ticket a partir da interface pública. Informações sobre a consulta do ticket são automaticamente adicionadas.
+TicketParamPublicInterface=Configuração da interface pública
+TicketsEmailMustExist=Exigir um endereço de email existente para criar um ticket
+TicketsEmailMustExistHelp=Na interface pública, o endereço de email já deve estar preenchido no banco de dados para criar um novo ticket.
+PublicInterface=Interface pública
+TicketUrlPublicInterfaceLabelAdmin=URL da interface pública
+TicketUrlPublicInterfaceHelpAdmin=É possível definir um alias para o servidor da Web e, assim, disponibilizar a interface pública para outro endereço IP.
+TicketPublicInterfaceTextHomeLabelAdmin=Texto de boas vindas da interface pública
+TicketPublicInterfaceTextHome=Você pode criar um ticket ou visualização de suporte existente a partir do ticket de rastreamento do identificador.
+TicketPublicInterfaceTextHomeHelpAdmin=O texto aqui definido aparecerá na home page da interface pública.
+TicketPublicInterfaceTopicLabelAdmin=Título da interface
+TicketPublicInterfaceTopicHelp=Este texto aparecerá como o título da interface pública.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Texto de ajuda para a entrada da mensagem
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Este texto aparecerá acima da área de entrada de mensagens do usuário.
+ExtraFieldsTicket=Atributos extras
+TicketCkEditorEmailNotActivated=O editor de HTML não está ativado. Coloque o conteúdo de FCKEDITOR_ENABLE_MAIL em 1 para obtê-lo.
+TicketsDisableEmail=Não envie e-mails para criação de bilhetes ou gravação de mensagens
+TicketsDisableEmailHelp=Por padrão, os emails são enviados quando novos bilhetes ou mensagens são criados. Ative esta opção para desativar * todas as notificações por e-mail
+TicketsLogEnableEmail=Ativar log por email
+TicketsLogEnableEmailHelp=A cada alteração, um e-mail será enviado ** para cada contato ** associado ao ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Exibe o logotipo do módulo na interface pública
+TicketsShowModuleLogoHelp=Ative esta opção para ocultar o módulo de logotipo nas páginas da interface pública
+TicketsShowCompanyLogo=Exibir o logotipo da empresa na interface pública
+TicketsShowCompanyLogoHelp=Ative esta opção para ocultar o logotipo da empresa principal nas páginas da interface pública
+TicketsEmailAlsoSendToMainAddress=Também enviar notificação para o endereço de email principal
+TicketsEmailAlsoSendToMainAddressHelp=Ative esta opção para enviar um email para o endereço "Notificação de email de" (veja a configuração abaixo)
+TicketsLimitViewAssignedOnly=Restringir a exibição aos bilhetes atribuídos ao usuário atual (não efetivo para usuários externos, sempre limitado à terceira parte da qual eles dependem)
+TicketsLimitViewAssignedOnlyHelp=Somente bilhetes atribuídos ao usuário atual ficarão visíveis. Não se aplica a um usuário com direitos de gerenciamento de bilhetes.
+TicketsActivatePublicInterface=Ativar interface pública
+TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer visitante crie bilhetes.
+TicketsAutoAssignTicket=Atribuir automaticamente o usuário que criou o ticket
+TicketsAutoAssignTicketHelp=Ao criar um ticket, o usuário pode ser atribuído automaticamente ao ticket.
+TicketNumberingModules=Módulo de numeração de bilhetes
+TicketNotifyTiersAtCreation=Notificar terceiros na criação
+
+#
+# Index & list page
+#
+TicketsIndex=Bilhete - em casa
+TicketList=Lista de bilhetes
+TicketAssignedToMeInfos=Esta lista de bilhetes de exibição de página que são atribuídos ao usuário atual
+NoTicketsFound=Nenhum bilhete encontrado
+TicketViewAllTickets=Ver todos os bilhetes
+TicketViewNonClosedOnly=Ver apenas bilhetes abertos
+TicketStatByStatus=Tickets por status
+
+#
+# Ticket card
+#
+Ticket=Bilhete
+TicketCard=Bilhete de cartão
+CreateTicket=Criar ticket
+EditTicket=Editar ticket
+TicketsManagement=Gestão de bilhetes
+CreatedBy=Criado por
+NewTicket=Novo Bilhete
+SubjectAnswerToTicket=Bilhete de resposta
+TicketTypeRequest=Tipo de solicitação
+TicketCategory=Categoria
+SeeTicket=Veja o ingresso
+TicketMarkedAsRead=O ticket foi marcado como lido
+TicketReadOn=Leia
+TicketCloseOn=Clotured on
+MarkAsRead=Marcar ingresso como lido
+TicketMarkedAsReadButLogActionNotSaved=Bilhete marcado como fechado, mas nenhuma ação salva
+TicketHistory=Histórico de bilhetes
+AssignUser=Atribuir ao usuário
+TicketAssigned=Bilhete agora é atribuído
+TicketChangeType=Alterar tipo
+TicketChangeCategory=Alterar categoria
+TicketChangeSeverity=Alterar gravidade
+TicketAddMessage=Adiciona uma mensagem
+AddMessage=Adiciona uma mensagem
+MessageSuccessfullyAdded=Bilhete adicionado
+TicketMessageSuccessfullyAdded=Mensagem adicionada com sucesso
+TicketMessagesList=Lista de mensagens
+NoMsgForThisTicket=Nenhuma mensagem para este bilhete
+Properties=Classificação
+LatestNewTickets=Últimos bilhetes %s mais recentes (não lidos)
+TicketSeverity=Gravidade
+ShowTicket=Veja o ingresso
+RelatedTickets=Bilhetes relacionados
+TicketAddIntervention=Criar Intervenção
+CloseTicket=Fechar bilhete
+CloseATicket=Fechar um ticket
+ConfirmCloseAticket=Confirme o fechamento do ticket
+ConfirmDeleteTicket=Por favor confirme a exclusão de ingresso
+TicketDeletedSuccess=Bilhete excluído com sucesso
+TicketMarkedAsClosed=Bilhete marcado como fechado
+TicketMarkedAsClosedButLogActionNotSaved=Bilhete marcado como fechado mas sem log salvo!
+TicketDurationAuto=Duração calculada
+TicketDurationAutoInfos=Duração calculada automaticamente a partir de intervenções relacionadas
+TicketUpdated=Bilhete atualizado
+SendMessageByEmail=Enviar mensagem por email
+TicketNewMessage=Nova mensagem
+ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatário está vazio. Nenhum email enviado
+TicketGoIntoContactTab=Por favor, vá para a aba "Contatos" para selecioná-los
+TicketMessageMailIntro=Introdução
+TicketMessageMailIntroHelp=Este texto é adicionado apenas no início do email e não será salvo.
+TicketMessageMailIntroLabelAdmin=Introdução à mensagem ao enviar e-mail
+TicketMessageMailIntroText=Olá, <br> Uma nova resposta foi enviada em um ticket que você contata. Aqui está a mensagem: <br>
+TicketMessageMailIntroHelpAdmin=Este texto será inserido antes do texto da resposta a um ticket.
+TicketMessageMailSignature=Assinatura
+TicketMessageMailSignatureHelp=Este texto é adicionado somente no final do email e não será salvo.
+TicketMessageMailSignatureText=<p> Atenciosamente, </ p> <p> - </ p>
+TicketMessageMailSignatureLabelAdmin=Assinatura do email de resposta
+TicketMessageMailSignatureHelpAdmin=Este texto será inserido após a mensagem de resposta.
+TicketMessageHelp=Apenas este texto será salvo na lista de mensagens no cartão do ticket.
+TicketMessageSubstitutionReplacedByGenericValues=As variáveis ​​de substituição são substituídas por valores genéricos.
+TimeElapsedSince=Tempo decorrido desde
+TicketTimeToRead=Tempo decorrido antes de ler
+TicketContacts=Bilhete de contatos
+TicketDocumentsLinked=Documentos vinculados ao ticket
+ConfirmReOpenTicket=Confirmar reabrir este ticket?
+TicketMessageMailIntroAutoNewPublicMessage=Uma nova mensagem foi postada no ticket com o assunto %s:
+TicketAssignedToYou=Bilhete atribuído
+TicketAssignedEmailBody=Você recebeu o bilhete # %s por %s
+MarkMessageAsPrivate=Marcar mensagem como privada
+TicketMessagePrivateHelp=Esta mensagem não será exibida para usuários externos
+TicketEmailOriginIssuer=Emissor na origem dos bilhetes
+InitialMessage=Mensagem inicial
+LinkToAContract=Link para um contrato
+TicketPleaseSelectAContract=Selecione um contrato
+UnableToCreateInterIfNoSocid=Não é possível criar uma intervenção quando nenhum terceiro é definido
+TicketMailExchanges=Trocas de correio
+TicketInitialMessageModified=Mensagem inicial modificada
+TicketMessageSuccesfullyUpdated=Mensagem atualizada com sucesso
+TicketChangeStatus=Alterar status
+TicketConfirmChangeStatus=Confirme a mudança de status: %s?
+TicketLogStatusChanged=Status alterado: %s para %s
+TicketNotNotifyTiersAtCreate=Não notificar a empresa na criação
+Unread=Não lida
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Bilhete lido por %s
+NoLogForThisTicket=Ainda não há registro para este ticket
+TicketLogAssignedTo=Bilhete atribuído a %s
+TicketAssignedButLogActionNotSaved=Bilhete atribuído, mas nenhum log salvo!
+TicketLogPropertyChanged=Alterar classificação: de %s para %s
+TicketLogClosedBy=Bilhete fechado por %s
+TicketLogProgressSetTo=Mudança de progresso para %s por cento
+TicketLogReopen=Bilhete reaberto
+
+#
+# Public pages
+#
+TicketSystem=Ticket System
+ShowListTicketWithTrackId=Exibir lista de bilhetes do ID da faixa
+ShowTicketWithTrackId=Exibir ticket do ID da faixa
+TicketPublicDesc=Você pode criar um ticket de suporte ou verificar a partir de um ID existente.
+YourTicketSuccessfullySaved=O ticket foi salvo com sucesso!
+MesgInfosPublicTicketCreatedWithTrackId=Um novo ticket foi criado com o ID %s.
+PleaseRememberThisId=Por favor, mantenha o número de rastreamento que podemos perguntar mais tarde.
+TicketNewEmailSubject=Confirmação de criação de bilhetes
+TicketNewEmailSubjectCustomer=Novo ticket de suporte
+TicketNewEmailBody=Este é um email automático para confirmar que você registrou um novo ticket.
+TicketNewEmailBodyCustomer=Este é um email automático para confirmar que um novo ticket acaba de ser criado na sua conta.
+TicketNewEmailBodyInfosTicket=Informações para monitorar o ticket
+TicketNewEmailBodyInfosTrackId=Número de rastreamento de bilhetes: %s
+TicketNewEmailBodyInfosTrackUrl=Você pode ver o progresso do ticket clicando no link acima.
+TicketNewEmailBodyInfosTrackUrlCustomer=Você pode ver o progresso do ticket na interface específica clicando no seguinte link
+TicketEmailPleaseDoNotReplyToThisEmail=Por favor, não responda diretamente a este e-mail! Use o link para responder na interface.
+TicketPublicInfoCreateTicket=Este formulário permite que você registre um ticket de suporte em nosso sistema de gerenciamento.
+TicketPublicPleaseBeAccuratelyDescribe=Por favor descreva com precisão o problema. Forneça o máximo de informações possíveis para permitir que identifiquemos sua solicitação corretamente.
+TicketPublicMsgViewLogIn=Insira o código de acompanhamento do bilhete
+TicketTrackId=ID de acompanhamento
+OneOfTicketTrackId=Um de seu ID de rastreamento
+ErrorTicketNotFound=Bilhete com ID de rastreamento %s não encontrado!
+Subject=Assunto
+ViewTicket=Visualizar passagem
+ViewMyTicketList=Ver minha lista de bilhetes
+ErrorEmailMustExistToCreateTicket=Erro: endereço de e-mail não encontrado em nosso banco de dados
+TicketNewEmailSubjectAdmin=Novo ticket criado
+TicketNewEmailBodyAdmin=<p> O ticket acaba de ser criado com a ID # %s, consulte as informações: </ p>
+SeeThisTicketIntomanagementInterface=Veja o ticket na interface de gerenciamento
+TicketPublicInterfaceForbidden=Acesso para esta área: proibido
+
+# notifications
+TicketNotificationEmailSubject=Bilhete %s atualizado
+TicketNotificationEmailBody=Esta é uma mensagem automática para notificá-lo de que o ticket %s acabou de ser atualizado
+TicketNotificationRecipient=Destinatário da notificação
+TicketNotificationLogMessage=Mensagem de log
+TicketNotificationEmailBodyInfosTrackUrlinternal=Visualizar ticket na interface
+TicketNotificationNumberEmailSent=E-mail de notificação enviado: %s
+
+
+#
+# Boxes
+#
+BoxLastTicket=Últimos bilhetes criados
+BoxLastTicketDescription=Últimos %s criado bilhetes
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=Não há bilhetes recentes não lidos
+BoxLastModifiedTicket=Últimos bilhetes modificados
+BoxLastModifiedTicketDescription=Últimos bilhetes modificados %s
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=Nenhum bilhete modificado recente
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 3cf64eab259..e6a32d0703d 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -1,29 +1,20 @@
 # Dolibarr language file - Source file is en_US - website
-WebsiteSetupDesc=Crie aqui o numero de entradas ao website que você precisa. Depois entre no menu websites para editá-las.
 DeleteWebsite=Apagar website
-ConfirmDeleteWebsite=Você tem certeza que deseja apagar este web site. Todas as páginas e conteúdos serão removidos.
 WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
 WEBSITE_PAGENAME=Nome da Página/Apelido
 WEBSITE_ALIASALT=Nomes / alias alternativos de página
 WEBSITE_CSS_URL=URL do arquivo CSS externo.
-WEBSITE_CSS_INLINE=Conteúdo do arquivo CSS (comum a todas as páginas)
-WEBSITE_JS_INLINE=Conteúdo do arquivo Javascript (comum a todas as páginas)
 WEBSITE_HTML_HEADER=Adição na parte inferior do cabeçalho HTML (comum a todas as páginas)
 WEBSITE_ROBOT=Arquivo robô (robots.txt)
-WEBSITE_HTACCESS=Arquivo do site .htaccess
 HtmlHeaderPage=Cabeçalho HTML (específico apenas para esta página)
 PageNameAliasHelp=Nome ou alias da página. Este alias também é usado para forjar um URL de SEO quando o site é executado a partir de um host virtual de um servidor Web (como o Apacke, o Nginx, ...). Use o botão "<strong> %s </ strong>" para editar este alias.
 EditTheWebSiteForACommonHeader=Nota: Se você quiser definir um cabeçalho personalizado para todas as páginas, edite o cabeçalho no nível do site em vez de na página / recipiente.
 MediaFiles=Biblioteca de mídias
-EditCss=Editar estilo / CSS ou cabeçalho HTML
-EditMedias=Editar mídias
-EditPageMeta=Editar Meta
 AddWebsite=Adicionar site
 Webpage=Página WEB / container
 AddPage=Adicionar página / recipiente
 HomePage=Pagina inicial
 PageContainer=Página / recipiente
-PreviewOfSiteNotYetAvailable=A Pré-visualização do seu website <strong>%s</strong> ainda não está disponível. Primeiro você deverá adicionar uma página.
 RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
 PageContent=Página / Contenair
 PageDeleted=Página / Contenair '%s' do site %s excluído
@@ -33,45 +24,28 @@ ViewPageInNewTab=Visualizar página numa nova aba
 SetAsHomePage=Definir com Página Inicial
 RealURL=URL real
 ViewWebsiteInProduction=Visualizar website usando origem URLs
-SetHereVirtualHost=Se você pode criar, no seu servidor web (Apache, Nginx, ...), um host virtual dedicado com PHP habilitado e um diretório raiz em <br> <strong> %s </ strong> <br> então entre aqui o virtual nome de host que você criou, então a pré-visualização pode ser feita também usando este acesso dedicado ao servidor web em vez de usar o servidor Dolibarr.
-YouCanAlsoTestWithPHPS=No ambiente de desenvolvimento, você pode preferir testar o site com o servidor web embutido no PHP (PHP 5.5 requisitado) executando <br> <strong> php -S 0.0.0.0:8080 -t %s </ strong>
+SetHereVirtualHost=<u> Usar com o Apache / NGinx /...</ u> <br> Se você pode criar, no seu servidor web (Apache, Nginx, ...), um Host Virtual dedicado com PHP habilitado e um diretório Root no <br> <strong> %s </ strong> <br> Em seguida, insira aqui o nome do host virtual que você criou, para que a visualização também possa ser feita usando esse acesso ao servidor Web dedicado, em vez de usar apenas o servidor Dolibarr.
+YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (o PHP 5.5 é necessário) executando o <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
 PreviewSiteServedByWebServer=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido por um servidor web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL servido por servidor externo: <br> <strong> %s </ strong>
 PreviewSiteServedByDolibarr=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido pelo servidor Dolibarr para que não seja necessário instalar qualquer servidor web extra (como Apache, Nginx, IIS). < br> O inconveniente é que o URL das páginas não é amigável e comece com o caminho do seu Dolibarr. URL de URL servido por Dolibarr: <br> <strong> %s </ strong> <br> <br> Para usar o seu próprio servidor web externo para servir este site, crie um host virtual em seu servidor web que aponte para o diretório <br> <strong> %s </ strong> <br> e digite o nome deste servidor virtual e clique no outro botão de visualização .
 VirtualHostUrlNotDefined=URL do host virtual veiculado pelo servidor web externo não definido
 NoPageYet=Ainda não há páginas
 SyntaxHelp=Ajuda sobre dicas de sintaxe específicas
-YouCanEditHtmlSourceckeditor=Você pode editar o código-fonte HTML usando o botão "Fonte" no editor.
-YouCanEditHtmlSource=<br> <span class = "fa fa-bug"> </ span> Você pode incluir o código PHP nesta fonte usando tags <strong> &lt;? php? a076925z0 </ strong>. As seguintes variáveis ​​globais estão disponíveis: $ conf, $ langs, $ db, $ mysoc, $ user, $ website. <br> <br> <span class = "fa fa bug"> </ span> Você também pode incluir conteúdo de outra Página / Container com a seguinte sintaxe: <br> <strong> &lt;? php includeContainer ('alias_of_container_to_include'); ? a076925z0 </ strong> <br> <br> <span class = "fa fa bug"> </ span> Você pode redirecionar para outra Página / Container com a seguinte sintaxe: <br> <strong> &lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ? &gt; </ strong> <br> <br> <span class = "fa fa-download"> </ span> Para incluir um <strong> link para baixar </ strong> um arquivo armazenado nos <strong> documentos < / strong>, use o <strong> document.php </ strong> wrapper: <br> Exemplo, para um arquivo em documentos / ecm (precisa ser logado), a sintaxe é: <br> <strong> &lt;a href = "/document.php?modulepart=ecm&file=[relative_dir/]filename.ext" a076925z0 </ strong> <br> Para um arquivo em documentos / mídias (abrir diretório para acesso público), a sintaxe é: <br> <strong> &lt;a href = "/ document.php? modulepart = medias & file = [relative_dir /] filename.ext" a076925z0 </ strong> <br> Para um arquivo compartilhado com um link compartilhado (acesso aberto usando a chave de hash de compartilhamento do arquivo), sintaxe é: <br> <strong> &lt;a href = "/ document.php? hashp = publicsharekeyoffile" a076925z0 </ strong> <br> <br> <span class = "fa fa-picture-o"> </ span> Para incluir uma imagem <strong> </ strong> armazenada no diretório <strong> documentos </ strong>, use o wrapper <strong> viewimage.php </ strong>: Exemplo, para uma imagem em documentos / mídias (acesso aberto), a sintaxe é: <br> <strong> &lt;a href = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext" a076925z0 </ strong> <br>
 ClonePage=Página clone / container
 CloneSite=Site Clone
-SiteAdded=Site adicionado
 ConfirmClonePage=Digite o código / alias da nova página e se é uma tradução da página clonada.
-PageIsANewTranslation=A nova página é uma tradução da página atual?
-LanguageMustNotBeSameThanClonedPage=Você clona uma página como uma tradução. O idioma da nova página deve ser diferente do idioma da página de origem.
-ParentPageId=ID da página principal
-WebsiteId=ID do site
 CreateByFetchingExternalPage=Criar página / recipiente obtendo página do URL externo ...
-OrEnterPageInfoManually=Ou crie a página vazia do zero ...
 FetchAndCreate=Procure e crie
-ExportSite=Exportar site
-IDOfPage=Id da página
-Banner=Bandeira
 BlogPost=Postagem do blog
-WebsiteAccount=Conta do site
-WebsiteAccounts=Contas do site
 AddWebsiteAccount=Criar conta do site
 BackToListOfThirdParty=Voltar à lista para Terceiros
 DisableSiteFirst=Desativar o site primeiro
 MyContainerTitle=Título do meu site
-AnotherContainer=Outro recipiente
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / pass) para cada site / terceira parte
 YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
 OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
 GrabImagesInto=Pegue também imagens encontradas no css e na página.
-ImagesShouldBeSavedInto=As imagens devem ser salvas no diretório
 WebsiteRootOfImages=Diretório raiz para imagens do site
-SubdirOfPage=Subdiretório dedicado à página
 AliasPageAlreadyExists=Alias ​​página <strong> %s </ strong> já existe
 CorporateHomePage=Página inicial corporativa
-EmptyPage=Página vazia
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index e980da3eb0c..89db209e4bd 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -42,9 +42,6 @@ StatusMotif2=Solicitação contestada
 StatusMotif3=Nenhum pedido para pagamento por Débito direto
 StatusMotif4=Pedido do Cliente
 StatusMotif8=Outras razões
-CreateForSepaFRST=Criar arquivo de débito direto (SEPA FRST)
-CreateForSepaRCUR=Criar arquivo de débito direto (SEPA RCUR)
-CreateAll=Criar arquivo de débito direto (todos)
 CreateGuichet=Apenas do escritório
 OrderWaiting=Aguardando resolução
 NotifyTransmision=Retirada de Transmissão
@@ -64,22 +61,15 @@ RUMLong=Unique Mandate Reference (Referência Única de Mandato)
 WithdrawMode=Modo de Débito direto (FRST ou RECUR)
 WithdrawRequestAmount=Quantidade de pedido de débito direto:
 WithdrawRequestErrorNilAmount=Não foi possível criar solicitação de débito direto para quantidade vazia.
-SepaMandate=Mandato de Débito Direto SEPA
-SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Favor devolver este formulário de mandato por e-mail para %s ou por correio para
 SEPALegalText=Pela assinatura deste formulário de mandato, você autoriza (A) %s a enviar instruções para o seu banco efetuar débito em sua conta e (B) que o seu banco efetue débito em sua conta de acordo com as instruções de %s. Como parte dos seus direitos, você tem direito ao reembolso do seu banco sob os termos e condições do acordo com ele firmado. O reembolso deve ser solicitado dentro de 8 semanas a partir da data em que a sua conta foi debitada. Os seus direitos relativos ao mandato acima são explicados em uma declaração que você pode obter junto a seu banco.
-CreditorIdentifier=Identificador do Credor
-CreditorName=Nome do Credor
 SEPAFillForm=(B) Favor preencher todos os campos marcados com *
 SEPAFormYourName=Seu nome
 SEPAFormYourBAN=Nome da Conta do Seu Banco (IBAN)
 SEPAFormYourBIC=Código Identificador do Seu Banco (BIC)
-SEPAFrstOrRecur=Tipo de pagamento
 ModeRECUR=Pagamento recorrente
-ModeFRST=Pagamento único
 PleaseCheckOne=Favor marcar apenas um
 DirectDebitOrderCreated=Pedido de débito direto %s criado
-AmountRequested=Quantidade solicitada
 InfoCreditSubject=Pagamento do pedido com pagamento por Débito direto %s pelo banco
 InfoCreditMessage=O pagamento do pedido por Débito direto %s foi feito pelo banco.<br>Dados do pagamento: %s
 InfoTransSubject=Transmissão do pedido com pagamento por Débito direto %s para o banco
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 9d552969aa0..014429c3d43 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -9,7 +9,7 @@ ACCOUNTING_EXPORT_AMOUNT=Exportar quantia
 ACCOUNTING_EXPORT_DEVISE=Exportar moeda
 Selectformat=Selecione o formato para o ficheiro
 ACCOUNTING_EXPORT_FORMAT=Selecione o formato para o ficheiro
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno de carro
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo para o nome de ficheiro
 ThisService=Este serviço
 ThisProduct=Este produto
@@ -26,25 +26,29 @@ Chartofaccounts=Gráfico de contas
 CurrentDedicatedAccountingAccount=Conta dedicada atual
 AssignDedicatedAccountingAccount=Nova conta para atribuir
 InvoiceLabel=Etiqueta da fatura
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OverviewOfAmountOfLinesNotBound=Visão geral da quantidade de linhas não ligadas a uma conta contábil
+OverviewOfAmountOfLinesBound=Visão geral da quantidade de linhas já vinculadas a uma conta contábil
 OtherInfo=Outra informação
 DeleteCptCategory=Remover conta contabilistica do grupo
 ConfirmDeleteCptCategory=Tem a certeza que deseja remover esta conta contabilística deste grupo?
-JournalizationInLedgerStatus=Status of journalization
+JournalizationInLedgerStatus=Status da jornalização
 AlreadyInGeneralLedger=Já foi registado nos diários contabilísticos
-NotYetInGeneralLedger=Not yet journalized in ledgers
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non zero values
-ListOfAccounts=List of accounts
+NotYetInGeneralLedger=Ainda não é publicado em livros
+GroupIsEmptyCheckSetup=Grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
+DetailByAccount=Mostrar detalhes por conta
+AccountWithNonZeroValues=Contas com valores diferentes de zero
+ListOfAccounts=Lista de contas
+CountriesInEEC=Países da CEE
+CountriesNotInEEC=Países não na CEE
+CountriesInEECExceptMe=Países na CEE, exceto %s
+CountriesExceptMe=Todos os países, exceto %s
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForCustomersNotDefined=Principal conta contábil para clientes não definidos na configuração
+MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores não definidos na configuração
+MainAccountForUsersNotDefined=Principal conta contábil para usuários não definidos na configuração
+MainAccountForVatPaymentNotDefined=Principal conta contábil para pagamento de IVA não definida na configuração
 
-AccountancyArea=Accounting area
+AccountancyArea=Área de contabilidade
 AccountancyAreaDescIntro=O uso do módulo de contabilidade é feito em várias etapas:
 AccountancyAreaDescActionOnce=As seguintes ações são geralmente executadas apenas uma vez, ou uma vez por ano ...
 AccountancyAreaDescActionOnceBis=Os próximos passos devem ser efetuados para economizar tempo no futuro, sugerindo-lhe a conta contabilística padrão correta quando estiver a ser feito um registo no Livro Razão e nos Diários.
@@ -55,14 +59,14 @@ AccountancyAreaDescChartModel=PASSO %s: Crie um modelo de gráfico de conta no m
 AccountancyAreaDescChart=PASSO %s: Criar or verificar conteúdo do seu gráfico de conta no menu %s
 
 AccountancyAreaDescVat=PASSO %s: Defina a conta contabilística para cada taxa de IVA. Para tal pode usar a entrada %s do menu.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: definir contas contábeis padrão. Para isso, use a entrada do menu %s.
 AccountancyAreaDescExpenseReport=PASSO %s: Defina a conta contabilística para o relatório de despesa. Para tal pode usar a entrada do menu %s.
 AccountancyAreaDescSal=PASSO %s: Defina a conta contabilística para o pagamento de salários. Para tal pode usar a entrada do menu %s.
-AccountancyAreaDescContrib=PASSO %s: Defina a conta contabilística para despesas especiais (outros impostos). Para tal pode usar a entrada do menu %s.
+AccountancyAreaDescContrib=ETAPA %s: Definir contas contábeis padrão para despesas especiais (impostos diversos). Para isso, use a entrada do menu %s.
 AccountancyAreaDescDonation=PASSO %s: Defina a conta contabilística para donativos. Para tal pode usar a entrada do menu %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescMisc=ETAPA %s: Defina contas padrão obrigatórias e contas contábeis padrão para transações diversas. Para isso, use a entrada do menu %s.
 AccountancyAreaDescLoan=PASSO %s: Defina a conta contabilística para empréstimos. Para tal pode usar a entrada do menu %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: defina as contas contábeis e o código do diário para cada banco e contas financeiras. Para isso, use a entrada do menu %s.
 AccountancyAreaDescProd=PASSO %s: Defina a contas contabilística para os seus produtos. Para tal pode usar a entrada %s do menu.
 
 AccountancyAreaDescBind=PASSO %s: Verifique a ligação entre as linhas %s existentes e a conta contabilística foi efetuada, de forma a que a aplicação possa registar as transações no Livro Razão num só clique. Complete ligações que faltam. Para tal, utilize a entrada do menu %s.
@@ -71,7 +75,7 @@ AccountancyAreaDescAnalyze=PASSO %s: Adicionar ou editar transações e gerar re
 
 AccountancyAreaDescClosePeriod=PASSO %s: Fechar período para que não seja possível modificar no futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Uma etapa obrigatória na configuração não foi concluída (o diário do código contábil não foi definido para todas as contas bancárias)
 Selectchartofaccounts=Selecione gráfico de contas ativo 
 ChangeAndLoad=Mudar e carregar
 Addanaccount=Adicione uma conta contabilística
@@ -91,7 +95,7 @@ MenuProductsAccounts=Contas de produtos
 ProductsBinding=Contas de produtos
 Ventilation=Vinculação a contas
 CustomersVentilation=Associação à fatura do cliente
-SuppliersVentilation=Vendor invoice binding
+SuppliersVentilation=Vinculação de fatura do fornecedor
 ExpenseReportsVentilation=Vinculação do relatório de despesas
 CreateMvts=Criar nova transação
 UpdateMvts=Modificação de uma transação
@@ -99,7 +103,7 @@ ValidTransaction=Validar transação
 WriteBookKeeping=Registar transações no Livro Razão
 Bookkeeping=Livro Razão
 AccountBalance=Saldo da conta
-ObjectsRef=Source object ref
+ObjectsRef=Ref de objeto de origem
 CAHTF=Total de compras em fornecedores sem impostos
 TotalExpenseReport=Relatório da despesa total
 InvoiceLines=Linhas de faturas a vincular
@@ -119,7 +123,7 @@ LineOfExpenseReport=Linha de relatório de despesas
 NoAccountSelected=Nenhuma conta contabilística selecionada
 VentilatedinAccount=Vinculado com sucesso a conta de contabilística
 NotVentilatedinAccount=Não vinculado à conta contabilística
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineSuccessfullyBinded=produtos / serviços %s vinculados com êxito a uma conta contábil
 XLineFailedToBeBinded=%s produtos/serviços não foram vinculados a uma conta contabilística
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos para vincular, mostrado por página (máximo recomendado: 50)
@@ -132,14 +136,14 @@ ACCOUNTING_LENGTH_GACCOUNT=Tamanho das contas contabilísticas gerais (se defini
 ACCOUNTING_LENGTH_AACCOUNT=Tamanho das contas contabilísticas de terceiros (se definir o valor deste campo a 6, então a conta '401' irá ser mostrada como '401000')
 ACCOUNTING_MANAGE_ZERO=Permitir a gestão do número de zeros no fim da designação da conta contabilística. Isto é necessário em alguns países (como a Suíça). Se desativada (por defeito), você poderá definir os 2 seguintes parâmetros de forma a que a aplicação adicione zeros virtualmente.
 BANK_DISABLE_DIRECT_INPUT=Desactivar a gravação direta de transação na conta bancária
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ativar exportação de rascunho em diário
 
 ACCOUNTING_SELL_JOURNAL=Diário de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário de diversos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatório de despesas
 ACCOUNTING_SOCIAL_JOURNAL=Diário social
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_HAS_NEW_JOURNAL=Tem novo Jornal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contabilística de transferência
 ACCOUNTING_ACCOUNT_SUSPENSE=Conta contabilística de espera
@@ -154,100 +158,102 @@ Doctype=Tipo de documento
 Docdate=Data
 Docref=Referência
 LabelAccount=Etiqueta de conta
-LabelOperation=Label operation
+LabelOperation=Operação de etiqueta
 Sens=Sentido
+LetteringCode=Código de rotulação
 Codejournal=Diário
 NumPiece=Número da peça
 TransactionNumShort=Núm. de transação
 AccountingCategory=Grupos personalizados
 GroupByAccountAccounting=Agrupar por conta contabilística
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de conta contábil. Eles serão usados ​​para relatórios contábeis personalizados.
 ByAccounts=Por contas
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+ByPredefinedAccountGroups=Por grupos predefinidos
+ByPersonalizedAccountGroups=Por grupos personalizados
 ByYear=por ano
 NotMatch=Não configurado
 DeleteMvt=Eliminar as linhas do Livro Razão
 DelYear=Ano a apagar
 DelJournal=Diário a apagar
 ConfirmDeleteMvt=Isto irá apagar todas as linhas do Livro Razão para o ano atual e/ou de um diário específico. Pelo menos um critério é necessário.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvtPartial=Isso excluirá a transação do razão (todas as linhas relacionadas à mesma transação serão excluídas)
 FinanceJournal=Diário financeiro
 ExpenseReportsJournal=Diário de relatórios de despesas
 DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=Esta é uma visão do registro que está vinculada a uma conta contábil e pode ser registrada no Ledger.
 VATAccountNotDefined=Conta para efeitos de IVA não definido
 ThirdpartyAccountNotDefined=Conta para terceiros não definido
 ProductAccountNotDefined=Conta para o produto não definido
 FeeAccountNotDefined=Conta para o honorário não definida
 BankAccountNotDefined=Conta de banco não definida
 CustomerInvoicePayment=Pagamento de fatura a cliente
-ThirdPartyAccount=Third party account
+ThirdPartyAccount=Conta de terceiros
 NewAccountingMvt=Nova transação
 NumMvts=Número da transação
 ListeMvts=Lista de movimentos
 ErrorDebitCredit=Débito e crédito não pode ter um valor, ao mesmo tempo
 AddCompteFromBK=Adicionar contas contabilisticas ao grupo
 ReportThirdParty=Lista de contas de terceiros
-DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
+DescThirdPartyReport=Consulte aqui a lista de clientes e fornecedores de terceiros e suas contas contábeis
 ListAccounts=Lista de contas contabilísticas
-UnknownAccountForThirdparty=Unknown third party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
+UnknownAccountForThirdparty=Conta de terceiros desconhecida. Nós usaremos %s
+UnknownAccountForThirdpartyBlocking=Conta de terceiros desconhecida. Erro de bloqueio
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros desconhecida e conta em espera não definida. Erro de bloqueio
+PaymentsNotLinkedToProduct=Pagamento não vinculado a nenhum produto / serviço
 
-Pcgtype=Group of account
-Pcgsubtype=Subgroup of account
-PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=Grupo de conta
+Pcgsubtype=Subgrupo de conta
+PcgtypeDesc=Grupo e subgrupo de conta são usados ​​como critérios predefinidos de 'filtro' e 'agrupamento' para alguns relatórios contábeis. Por exemplo, 'RENDA' ou 'DESPESA' são usados ​​como grupos para contas contábeis de produtos para criar o relatório de despesas / receitas.
 
 TotalVente=Total de volume de negócios sem impostos
 TotalMarge=Margem total de vendas
 
 DescVentilCustomer=Consulte aqui a lista de linhas de faturas a clientes associados (ou não) a uma conta contabilística de produto
-DescVentilMore=Na maioria dos casos, se você usar produtos ou serviços predefinidos e configurar o número de conta no cartão do produto/serviço, a aplicação será capaz de efetuar toda a vinculação entre a linhas das faturas e a conta contabilística do seu gráfico de contas através de um clique no botão <strong>"%s"</strong>. Se a conta não for configurada no cartão do produto/serviço or se você tiver algumas linhas não vinculadas a uma conta, então terá de efetuar a vinculação manual a partir do menu "<strong>%s</strong>".
+DescVentilMore=Na maioria dos casos, se você usar produtos ou serviços predefinidos e definir o número da conta no cartão de produto / serviço, o aplicativo poderá fazer toda a ligação entre suas linhas de fatura e a conta contábil de seu plano de contas, apenas em um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida em cartões de produtos / serviços ou se você ainda tiver algumas linhas não vinculadas a uma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
 DescVentilDoneCustomer=Consulte aqui a lista das linhas de faturas a clientes e as suas contas de contabilísticas de produto
 DescVentilTodoCustomer=Vincular linhas da fatura que não estejam vinculadas a uma conta contabilística de produto
 ChangeAccount=Alterar a conta contabilística de produto/serviço para as linhas selecionadas com a seguinte conta contabilística:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
+DescVentilSupplier=Consulte aqui a lista de linhas de faturas do fornecedor vinculadas ou ainda não ligadas a uma conta de contabilidade do produto
+DescVentilDoneSupplier=Consulte aqui a lista das linhas de fornecedores de faturas e sua conta contábil
 DescVentilTodoExpenseReport=Vincule as linhas do relatórios de despesas de não vinculados a um honorário de uma conta de contabilística
 DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesas vinculadas (ou não) a um honorário da conta contabilística
-DescVentilExpenseReportMore=Se configurar a conta contabilística de acordo com o tipo de linha de relatório de despesa, a aplicação será capaz de efetuar toda a vinculação entre as linhas do seu relatório de despesas e a conta contabilística do seu gráfico de contas através de um único clique no botão <strong>"%s"</strong>. Se a conta não foi configurada no dicionário de honorários ou se você tem algumas linhas não vinculadas, então terá de efetuar a vinculação manuel no menu "<strong>%s</strong>".
+DescVentilExpenseReportMore=Se você configurar uma conta contábil no tipo de linhas de relatório de despesas, o aplicativo poderá fazer toda a ligação entre suas linhas de relatório de despesas e a conta contábil do seu plano de contas, em apenas um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida no dicionário de taxas ou se você ainda tiver algumas linhas não vinculadas a nenhuma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
 DescVentilDoneExpenseReport=Consulte aqui a lista das linhas de relatórios de despesas e os seus honorários da conta contabilística
 
 ValidateHistory=Vincular automaticamente
 AutomaticBindingDone=Vinculação automática efetuada
 
 ErrorAccountancyCodeIsAlreadyUse=Erro, não pode apagar esta conta contabilística porque está a ser utilizada
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+MvtNotCorrectlyBalanced=Movimento não corretamente balanceado. Débito = %s | Crédito = %s
+Balancing=Balanceamento
 FicheVentilation=Cartão de vinculação
 GeneralLedgerIsWritten=As transações são escritas no Livro Razão
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
+GeneralLedgerSomeRecordWasNotRecorded=Algumas das transações não puderam ser revistas. Se não houver outra mensagem de erro, provavelmente é porque já foram promovidas.
+NoNewRecordSaved=Não há mais registros para journalize
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta contabilística
 ChangeBinding=Alterar vinculação
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+Accounted=Contabilizado no ledger
+NotYetAccounted=Ainda não contabilizado no razão
 
 ## Admin
 ApplyMassCategories=Aplicar categorias em massa
-AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group
+AddAccountFromBookKeepingWithNoCategories=Conta disponível ainda não em um grupo personalizado
 CategoryDeleted=Categoria para a conta contabilística foi removida
 AccountingJournals=Diários contabilisticos
 AccountingJournal=Diário contabilistico
 NewAccountingJournal=Novo diário contabilistico
 ShowAccoutingJournal=Mostrar diário contabilistico
 Nature=Natureza
-AccountingJournalType1=Miscellaneous operations
+AccountingJournalType1=Operações diversas
 AccountingJournalType2=Vendas
 AccountingJournalType3=Compras
 AccountingJournalType4=Banco
 AccountingJournalType5=Relatório de despesas
-AccountingJournalType8=Inventory
+AccountingJournalType8=Inventário
 AccountingJournalType9=Contém novo
 ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta de contabilidade para imposto sobre vendas é definida no menu <b> %s </ b> - <b> %s </ b>
 
 ## Export
 ExportDraftJournal=Exportar o diário rascunho
@@ -261,22 +267,23 @@ Modelcsv_ciel=Exportar relativamente a Sage Ciel Compta ou Compta Evolution
 Modelcsv_quadratus=Exportar relativamente a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar relativamente a EBP
 Modelcsv_cogilog=Exportar relativamente a Cogilog
-Modelcsv_agiris=Export towards Agiris
-Modelcsv_configurable=Export Configurable
+Modelcsv_agiris=Exportar para o Agiris
+Modelcsv_configurable=Exportar CSV configurável
+Modelcsv_FEC=Exportação FEC (Art. L47 A) (Teste)
 ChartofaccountsId=ID de plano de contas
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Iniciar contabilidade
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+InitAccountancyDesc=Essa página pode ser usada para inicializar uma conta contábil em produtos e serviços que não tenham uma conta contábil definida para vendas e compras.
 DefaultBindingDesc=Esta página pode ser usada para definir uma conta padrão a ser usada para vincular registo de transações sobre salários, doações, impostos e IVA quando nenhuma conta contabilística específica estiver definida.
 Options=Opções
 OptionModeProductSell=Modo de vendas
 OptionModeProductBuy=Modo de compras
 OptionModeProductSellDesc=Mostrar todos os produtos com conta contabilística para as vendas.
 OptionModeProductBuyDesc=Mostrar todos os produtos com conta contabilística para as compras.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanFixHistory=Remover o código contábil das linhas que não existem nos gráficos de contas
 CleanHistory=Repor todas as vinculações para o ano selecionado
-PredefinedGroups=Predefined groups
+PredefinedGroups=Grupos pré-definidos
 WithoutValidAccount=Sem conta dedicada válido
 WithValidAccount=Com conta dedicada válida
 ValueNotIntoChartOfAccount=Este valor de conta de contabilística não existe no plano de contas
@@ -288,19 +295,19 @@ Formula=Fórmula
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Não foram efetuados alguns passos obrigatórios da configuração, por favor complete-os
-ErrorNoAccountingCategoryForThisCountry=Não existe grupo de conta contabilística disponível para o país %s (Consulte Inicio -> Configuração -> Dicionários)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ErrorNoAccountingCategoryForThisCountry=Não existe grupo de conta contabilística disponível para o país %s (Consulte Inicio->Configuração->Dicionários)
+ErrorInvoiceContainsLinesNotYetBounded=Você tenta analisar algumas linhas da fatura <strong> %s </ strong>, mas algumas outras linhas ainda não estão limitadas à conta contábil. A revogação de todas as linhas de fatura desta fatura é recusada.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algumas linhas na fatura não estão vinculadas à conta contábil.
 ExportNotSupported=O formato de exportação configurado não é suportado nesta página
-BookeppingLineAlreayExists=Linhas já existente em contabilidade
+BookeppingLineAlreayExists=Linhas já existentes na contabilidade
 NoJournalDefined=Nenhum diário definido
 Binded=Linhas vinculadas
 ToBind=Linhas a vincular
-UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
+UseMenuToSetBindindManualy=Linhas ainda não encadernadas, use o menu <a href="%s"> %s </a> para fazer a encadernação manualmente
 
 ## Import
-ImportAccountingEntries=Accounting entries
+ImportAccountingEntries=Entradas contábeis
 
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+WarningReportNotReliable=Atenção, este relatório não é baseado no Ledger, portanto, não contém transações modificadas manualmente no Ledger. Se a sua periodização estiver atualizada, a visão da contabilidade será mais precisa.
+ExpenseReportJournal=Diário de relatórios de despesas
+InventoryJournal=Diário de Inventário
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 6bf96e95f1d..b21744675fa 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -10,9 +10,9 @@ VersionDevelopment=Desenvolvimento
 VersionUnknown=Desconhecida
 VersionRecommanded=Recomendada
 FileCheck=Verificador da integridade dos ficheiros
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker, for example.
+FileCheckDesc=Esta ferramenta permite verificar a integridade dos arquivos e a configuração do seu aplicativo, comparando cada arquivo com o oficial. O valor de algumas constantes de configuração também pode ser verificado. Você pode usar essa ferramenta para detectar se alguns arquivos foram modificados por um hacker, por exemplo.
 FileIntegrityIsStrictlyConformedWithReference=A integridade dos ficheiros é ajustada rigorosamente conforme a referência.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegrityIsOkButFilesWereAdded=A verificação de integridade dos arquivos passou, no entanto, alguns novos arquivos foram adicionados.
 FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos ficheiros falhou. Alguns ficheiros foram modificados, removidos ou adicionados.
 GlobalChecksum=Checksum global
 MakeIntegrityAnalysisFrom=Fazer a análise de integridade dos ficheiros de aplicativos a partir de
@@ -30,14 +30,14 @@ SessionSaveHandler=Utilizador para guardar as sessões
 SessionSavePath=Localização de armazenamento da sessão
 PurgeSessions=Limpeza das sessões
 ConfirmPurgeSessions=Deseja mesmo limpar todas as sessões? Isto irá desassociar todos os utilizadores (exceto você).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+NoSessionListWithThisHandler=Salvar manipulador de sessão configurado no seu PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas ligações
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova conexão Dolibarr a si mesmo? Apenas o usuário <b> %s </ b> poderá se conectar depois disso.
 UnlockNewSessions=Remover bloqueio de ligação
 YourSession=A sua sessão
 Sessions=Sessões dos utilizadores
 WebUserGroup=Utilizador/grupo do servidor da Web
-NoSessionFound=Your PHP seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
+NoSessionFound=Seu PHP parece não permitir a listagem de sessões ativas. O diretório usado para salvar sessões (<b> %s </ b>) pode estar protegido (por exemplo, por permissões do sistema operacional ou pela diretiva do PHP open_basedir).
 DBStoringCharset=Conjunto de carateres  da base de dados para guardar os dados
 DBSortingCharset=Conjunto de carateres da base de dados para ordenar os dados
 ClientCharset=Jogo de caráter Cliente
@@ -68,8 +68,8 @@ ErrorCodeCantContainZero=O código não pode conter o valor 0
 DisableJavascript=Desativar as funções de Javascript e Ajax (Recomendado para pessoas invisuais ou navegadores de texto)
 UseSearchToSelectCompanyTooltip=Se tiver um grande número de terceiros (> 100 000), pode aumentar a velocidade, configurando a constante COMPANY_DONOTSEARCH_ANYWHERE para 1 em Configuração->Outros. A procura depois será limitada para o início da sequência de carateres.
 UseSearchToSelectContactTooltip=Se você tiver grande número de contactos (> 100 000), você pode aumentar a velocidade, definindo a constante CONTACT_DONOTSEARCH_ANYWHERE para 1 em Configuração -> Outros. A pesquisa será então limitada ao início da sequência de caracteres.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectCompany=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de terceiros. <br> Isso pode aumentar o desempenho se você tiver um grande número de terceiros, mas é menos conveniente.
+DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de contatos. <br> Isso pode aumentar o desempenho se você tiver um grande número de contatos, mas for menos conveniente)
 NumberOfKeyToSearch=Número de carateres para acionar a procura: %s
 NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax está desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode escolher um projeto associado a outro terceiro
@@ -80,7 +80,7 @@ PreviewNotAvailable=Pré-visualização não disponível
 ThemeCurrentlyActive=Tema atualmente ativo
 CurrentTimeZone=Zona Horária PHP (servidor)
 MySQLTimeZone=Fuso Horário MySQL (base de dados)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=As datas são armazenadas e retornadas pelo servidor de banco de dados como se fossem mantidas como uma string enviada. O fuso horário só tem efeito ao usar a função UNIX_TIMESTAMP (que não deve ser usada pelo Dolibarr, portanto, o banco de dados TZ não deve ter efeito, mesmo se for alterado depois que os dados forem inseridos).
 Space=Área
 Table=Tabela
 Fields=Campos
@@ -126,8 +126,8 @@ PHPTZ=Fuso Horário do servidor do PHP
 DaylingSavingTime=Horário de verão
 CurrentHour=Hora do PHP (servidor)
 CurrentSessionTimeOut=Sessão atual expirou
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+YouCanEditPHPTZ=Para definir um fuso horário PHP diferente (não obrigatório), você pode tentar adicionar um arquivo .htaccess com uma linha como "SetEnv TZ Europe / Paris"
+HoursOnThisPageAreOnServerTZ=Atenção, ao contrário de outros ecrãs, as horas nesta página não estão no fuso horário local, mas sim no fuso horário do servidor.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Número máximo de linhas para os widgets
@@ -191,15 +191,15 @@ IgnoreDuplicateRecords=Ignorar erros de registos duplicados (INSERT IGNORE)
 AutoDetectLang=Detetar Automático (idioma do navegador)
 FeatureDisabledInDemo=Opção desativada em demo
 FeatureAvailableOnlyOnStable=Funcionalidade apenas disponível em versões estáveis ​​oficiais
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+BoxesDesc=Widgets são componentes que mostram algumas informações que você pode adicionar para personalizar algumas páginas. Você pode escolher entre mostrar o widget ou não selecionando a página de destino e clicando em "Ativar" ou clicando na lixeira para desativá-la.
 OnlyActiveElementsAreShown=Só são mostrados os elementos de <a href="%s">módulos ativos</a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=Os módulos / aplicativos determinam quais recursos estão disponíveis no software. Alguns módulos requerem permissões para serem concedidos aos usuários depois de ativar o módulo. Clique no botão on / off (no final da linha do módulo) para ativar / desativar um módulo / aplicativo.
 ModulesMarketPlaceDesc=Pode encontrar mais módulos para descarregar noutros sites da internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=Se as permissões em seu sistema de arquivos permitirem, você poderá usar essa ferramenta para implantar um módulo externo. O módulo ficará visível na aba <strong> %s </ strong>.
 ModulesMarketPlaces=Procurar aplicações/módulos externos
 ModulesDevelopYourModule=Desenvolva as suas próprias aplicações/módulos
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+ModulesDevelopDesc=Você também pode desenvolver seu próprio módulo ou encontrar um parceiro para desenvolver um para você.
+DOLISTOREdescriptionLong=Em vez de ligar o site <a href="https://www.dolistore.com"> www.dolistore.com </a> para encontrar um módulo externo, você pode usar essa ferramenta incorporada que fará a pesquisa no mercado externo para você (pode ser lento, precisa de um acesso à internet) ...
 NewModule=Novo
 FreeModule=Livre
 CompatibleUpTo=Compatível com a versão %s
@@ -211,8 +211,8 @@ Nouveauté=Novidade
 AchatTelechargement=Comprar / Download
 GoModuleSetupArea=Para implementar/instalar um novo módulo, vá para a área de configuração do Módulo em <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, o mercado oficial para módulos externos Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
+DoliPartnersDesc=Lista de empresas que fornecem módulos ou recursos desenvolvidos sob medida. <br> Nota: como o Dolibarr é um aplicativo de código aberto, qualquer pessoa experiente em programação PHP pode desenvolver um módulo.
+WebSiteDesc=Sites externos para módulos adicionais (não principais) ...
 DevelopYourModuleDesc=Algumas soluções para desenvolver seu próprio módulo ...
 URL=Hiperligação
 BoxesAvailable=Aplicativos disponíveis
@@ -229,7 +229,7 @@ DoNotStoreClearPassword=Não guardar as palavras-passe na base de dados, mas gua
 MainDbPasswordFileConfEncrypted=Palavra-passe da base de dados encriptada no ficheiro conf.php (recomendado: Ativada)
 InstrucToEncodePass=Para que a palavra passe seja codificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="...";</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Para que a palavra passe seja descodificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protection of generated PDF files NOT recommended (breaks mass PDF generation)
+ProtectAndEncryptPdfFiles=Proteção de arquivos PDF gerados NÃO recomendado (quebra a geração de PDF em massa)
 ProtectAndEncryptPdfFilesDesc=A proteção de um documento PDF faz com que este esteja disponível para ler e imprimir a partir de qualquer navegador. No entanto, a edição e cópia do documento deixam de ser possíveis. Nota: ao usar esta funcionalidade deixa de ser possível juntar documentos PDFs singulares num único documento PDF global.
 Feature=Funcionalidade
 DolibarrLicense=Licença
@@ -246,8 +246,8 @@ ExternalResources=Recursos externos
 SocialNetworks=Redes sociais
 ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do Dolibarr<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para outras questões, como efectuar as consultas, pode utilizar o forum do Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+HelpCenterDesc1=Aqui estão alguns recursos para obter ajuda e suporte com o Dolibarr.
+HelpCenterDesc2=Alguns desses recursos estão disponíveis apenas em <b> english </ b>.
 CurrentMenuHandler=Gestor de menu atual
 MeasuringUnit=Unidade de medição
 LeftMargin=Margem esquerda
@@ -262,35 +262,35 @@ NoticePeriod=Período de aviso
 NewByMonth=Novo por mês
 Emails=Emails
 EMailsSetup=Configuração de emails
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=Esta página permite que você sobrescreva seus parâmetros PHP padrão para o envio de e-mail. Na maioria dos casos no sistema operacional Unix / Linux, a configuração do PHP está correta e esses parâmetros são desnecessários.
 EmailSenderProfiles=Perfis do remetente de e-mails
 MAIN_MAIL_SMTP_PORT=Porta de SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Hospedeiro de SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP / SMTPS (Não definida em PHP em sistemas Unix-like)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Hospedeiro de SMTP/SMTPS (Não definido no PHP nos sistemas de tipo Unix)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_EMAIL_FROM=E-mail do remetente para e-mails automáticos (valor padrão em php.ini: <b> %s </ b>)
+MAIN_MAIL_ERRORS_TO=E-mail usado para erro retorna e-mails (campos 'Erros-Para' nos e-mails enviados)
+MAIN_MAIL_AUTOCOPY_TO= Copiar (Cco) todos os emails enviados para
+MAIN_DISABLE_ALL_MAILS=Desativar todo o envio de email (para fins de teste ou demonstrações)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos os e-mails para (em vez de enviar para destinatários reais, para fins de teste)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employee users with email into allowed recipient list
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Adicionar usuários de funcionários com e-mail à lista de destinatários permitidos
+MAIN_MAIL_SENDMODE=Método de envio de e-mail
+MAIN_MAIL_SMTPS_ID=ID de SMTP (se o servidor de envio exigir autenticação)
+MAIN_MAIL_SMTPS_PW=Senha SMTP (se o servidor de envio exigir autenticação)
+MAIN_MAIL_EMAIL_TLS=Use criptografia TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS=Use a criptografia TLS (STARTTLS)
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de email
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de email para uso com o dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nome do seletor do dkim
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Chave privada para assinatura do dkim
+MAIN_DISABLE_ALL_SMS=Desativar todo o envio de SMS (para fins de teste ou demonstrações)
 MAIN_SMS_SENDMODE=Método a usar para enviar SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+MAIN_MAIL_SMS_FROM=Número de telefone do remetente padrão para envio de SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=E-mail do remetente padrão para envio manual (e-mail do usuário ou e-mail da empresa)
 UserEmail=Email do utilizador
 CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, você pode corrigir isso editando os arquivos no diretório <b> langs / %s </ b> e envie sua alteração para www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Se a tradução para este idioma não estiver completa ou se encontrar erros, pode corrigi-los editando os ficheiros na diretoria <b>langs/ %s</b> e submeta os ficheiros modificados em dolibarr.org/forum ou para os programadores em github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuração do módulo
 ModulesSetup=Módulos/Aplicação - Configuração
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Ferramentas multi-módulos
 ModuleFamilyExperimental=Módulos testes
 ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria)
 ModuleFamilyECM=Gestão de conteúdo empresarial (GCE)
-ModuleFamilyPortal=Websites e outras aplicações de interface de utilizador
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces com sistemas externos
 MenuHandlers=Gestores de menu
 MenuAdmin=Editor de menu
@@ -313,15 +313,15 @@ DoNotUseInProduction=Não utilizar em ambiente de produção
 ThisIsProcessToFollow=Estes são os passos a processar:
 ThisIsAlternativeProcessToFollow=Esta é uma configuração alternativa para processar manualmente:
 StepNb=Passo %s
-FindPackageFromWebSite=Find a package that provides features you want (for example on official web site %s).
+FindPackageFromWebSite=Encontre um pacote que ofereça recursos que você deseja (por exemplo, no site oficial %s).
 DownloadPackageFromWebSite=Descarregue o pacote (por exemplo, da página oficial %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into the server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+UnpackPackageInDolibarrRoot=Descompacte / descompacte os arquivos empacotados no diretório do servidor dedicado ao Dolibarr: <b> %s </ b>
+UnpackPackageInModulesRoot=Para implantar / instalar um módulo externo, descompacte / descompacte os arquivos empacotados no diretório do servidor dedicado aos módulos externos: <br> <b> %s </ b>
+SetupIsReadyForUse=A implantação do módulo está concluída. No entanto, você deve ativar e configurar o módulo em seu aplicativo acessando os módulos de configuração de página: <a href="%s"> %s </a>.
 NotExistsDirect=O diretório raiz alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3 do Dolibarr que é possível definir um diretório raiz alternativo. Isto permite que você consiga armazenar plug-ins e templates, num diretório dedicado.<br>Para tal basta criar um dirétorio na raiz do Dolibarr (ex: dedicado). <br>
 InfDirExample=<br>Depois declare-o no ficheiro <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Se estas linhas estiverem comentadas com um "#", descomente-as removendo o caracter "#".
-YouCanSubmitFile=Alternatively, you may upload the module .zip file package:
+YouCanSubmitFile=Alternativamente, você pode fazer o upload do pacote de arquivos .zip do módulo:
 CurrentVersion=Versão atual do Dolibarr
 CallUpdatePage=Vá à página que atualiza a estrutura e dados da base de dados: %s.
 LastStableVersion=Última versão estável
@@ -351,15 +351,15 @@ SeeWikiForAllTeam=Consulte a página wiki para obter uma lista completa de todos
 UseACacheDelay= Atraso, em segundos, para o caching de exportação (0 ou em branco para não criar cache)
 DisableLinkToHelpCenter=Ocultar hiperligação <b>"Precisa de ajuda ou apoio"</b> na página de inicio de sessão
 DisableLinkToHelp=Ocultar a hiperligação para a ajuda on-line "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+AddCRIfTooLong=Não há quebra automática de texto, o texto que é muito longo não será exibido nos documentos. Por favor adicione retornos de carro na área de texto, se necessário.
+ConfirmPurge=Tem certeza de que deseja executar essa limpeza? <br> Isso excluirá permanentemente todos os seus arquivos de dados sem nenhuma maneira de restaurá-los (arquivos ECM, arquivos anexados ...).
 MinLength=Comprimento mínimo
 LanguageFilesCachedIntoShmopSharedMemory=Ficheiros .lang carregados na memória partilhada
 LanguageFile=Ficheiro de idioma
-ExamplesWithCurrentSetup=Examples with current configuration
+ExamplesWithCurrentSetup=Exemplos com configuração atual
 ListOfDirectories=Lista de diretórios com modelos OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de diretórios que contêm ficheiros template com formato OpenDocument.<br><br>Digite aqui o caminho completo dos diretórios.<br>Adicione um "Enter" entre cada diratório.<br>Para adicionar um diretório do módulo GCE, adicione aqui <b>DOL_DATA_ROOT/ecm/seudiretorio</b>.<br><br>Ficheiros nesses diretórios têm de acabar com <b>.odt</b> ou <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+NumberOfModelFilesFound=Número de arquivos de modelo ODT / ODS encontrados nesses diretórios
 ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar os seus modelos de documentos ODT, antes de armazená-los nestes diretórios, leia a documentação no wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -369,19 +369,19 @@ KeyForWebServicesAccess=Chave para usar Web Services (parâmetro "dolibarrkey" n
 TestSubmitForm=Formulário de teste de introdução
 ThisForceAlsoTheme=Ao utilizar este gestor de menu também vai utilizar o seu tema, independentemente da escolha do utilizador. Para além disso, este gestor de menu especializado em smartphones não funciona em todos os smartphones. Utilize outro gestor de menu se você tiver problemas.
 ThemeDir=Diretório de temas
-ConnectionTimeout=Connection timeout
+ConnectionTimeout=Tempo limite de conexão
 ResponseTimeout=Tempo limite de resposta
 SmsTestMessage=Mensagem teste de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=Se precisa desta função, o módulo <b>%s</b> deve ser ativado antes.
 SecurityToken=A chave para URLs seguras
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external supplier, but you can find some on %s
+NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetentes SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
 PDF=PDF
-PDFDesc=You can set each global option related to the PDF generation
+PDFDesc=Você pode definir cada opção global relacionada à geração de PDF
 PDFAddressForging=Regras para criar caixas de endereço
 HideAnyVATInformationOnPDF=Ocultar todas as informações relacionadas com Imposto sobre Vendas / IVA em PDFs gerados
 PDFRulesForSalesTax=Regras para Imposto sobre Vendas / IVA
 PDFLocaltax=Regras para %s
-HideLocalTaxOnPDF=Hide %s rate in pdf column tax sale
+HideLocalTaxOnPDF=Ocultar %s taxa na venda de impostos da coluna pdf
 HideDescOnPDF=Ocultar a descrição dos produtos no PDF gerado
 HideRefOnPDF=Ocultar a referência dos produtos no PDF gerado
 HideDetailsOnPDF=Esconder linhas de detalhes do produto no PDF gerado
@@ -391,7 +391,7 @@ UrlGenerationParameters=Parâmetros para tornar URLs seguros
 SecurityTokenIsUnique=Use um parâmetro securekey único para cada URL
 EnterRefToBuildUrl=Digite a referência para o objeto %s
 GetSecuredUrl=Obter URL seguro
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Ocultar botões para usuários não administradores para ações não autorizadas, em vez de mostrar botões desativados acinzentados
 OldVATRates=Taxa de IVA antiga
 NewVATRates=Nova taxa de IVA
 PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em
@@ -412,13 +412,13 @@ ExtrafieldSelect = Lista de selecção
 ExtrafieldSelectList = Selecionar da tabela
 ExtrafieldSeparator=Separador (não um campo)
 ExtrafieldPassword=Palavra Passe
-ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldRadio=Botões de rádio (apenas uma opção)
 ExtrafieldCheckBox=Caixas de marcação
 ExtrafieldCheckBoxFromList=Caixas de marcação da tabela
 ExtrafieldLink=Vincular a um objeto
 ComputedFormula=Campo calculado
 ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer codificação PHP para obter um valor calculado dinâmico. Você pode usar todas as fórmulas compatíveis com PHP, incluindo o "?" operador de condição e seguinte objeto global: <strong>$db, $conf, $langs, $mysoc, $user, $object.</strong><br><strong>AVISO</strong>: Somente algumas propriedades de $object podem estar disponíveis. Se você precisa de propriedades não carregadas, basta buscar o objeto na sua fórmula, como no segundo exemplo. <br>Usando um campo calculado significa que você não pode entrar qualquer valor da interface. Além disso, se houver um erro de sintaxe, a fórmula pode retornar nada.<br><br> Exemplo de fórmula: <br>$object-> id <10? round ($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2) <br><br>Exemplo para recarregar o objeto <br>(($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $obj-> id: ($obj-> rowid? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Outro exemplo de fórmula para forçar a carga do objeto e seu objeto pai:<br> (($reloadedobj = new Task ($db)) && ($reloadedobj->fetch ($object-> id)> 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj-> fetch($reloadedobj->fk_project)> 0)) ? $secondloadedobj->ref: 'Projeto pai não encontrado'
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpPassword=Deixar esse campo em branco significa que esse valor será armazenado sem criptografia (o campo deve ser oculto apenas com estrela na tela). <br> Defina 'auto' para usar a regra de criptografia padrão para salvar a senha no banco de dados (o valor lido será o hash apenas, nenhuma maneira de recuperar o valor original)
 ExtrafieldParamHelpselect=A lista de parâmetros tem seguir o seguinte esquema chave,valor (no qual a chave não pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para que a lista dependa noutra lista de atributos complementares:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para que a lista dependa doutra lista:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
@@ -436,39 +436,39 @@ DefaultLink=Hiperligação predefinida
 SetAsDefault=Definir como predefinição
 ValueOverwrittenByUserSetup=Aviso: Este valor pode ter sido modificado pela configuração específica de um utilizador (cada utilizador pode definir o seu próprio link ClickToDial)
 ExternalModule=Módulo externo - Instalado no diretório %s
-BarcodeInitForthird-parties=Mass barcode init for third-parties
+BarcodeInitForthird-parties=Código de barras em massa init para terceiros
 BarcodeInitForProductsOrServices=Inicialização ou reposição de códigos de barras em massa para produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem o registo <strong>%s</strong> em <strong>%s</strong> %s sem o código de barras definido.
 InitEmptyBarCode=Inicializar o valor para os próximos %s registos vazios
 EraseAllCurrentBarCode=Apagar todos os códigos de barras atuais
 ConfirmEraseAllCurrentBarCode=Tem certeza de que deseja apagar todos os códigos de barras atuais?
 AllBarcodeReset=Todos os códigos de barras foram removidos
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the barcode module setup.
+NoBarcodeNumberingTemplateDefined=Nenhum modelo de código de barras de numeração ativado na configuração do módulo de código de barras.
 EnableFileCache=Ativar cache de ficheiros
 ShowDetailsInPDFPageFoot=Adicionar mais detalhes no rodapé dos ficheiros PDF, como a morada da sua empresa, ou nomes de gerente (para completar IDs profissionais, capital da empresa e número de IVA).
 NoDetails=Sem mais detalhes no rodapé
 DisplayCompanyInfo=Exibir morada da empresa
 DisplayCompanyManagers=Mostrar nomes dos gestores
 DisplayCompanyInfoAndManagers=Exibir a morada da empresa e menus de gestor
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by supplier code for a supplier accounting code
+EnableAndSetupModuleCron=Se você deseja que essa fatura recorrente seja gerada automaticamente, o módulo * %s * deve estar ativado e configurado corretamente. Caso contrário, a geração de faturas deve ser feita manualmente a partir desse modelo usando o botão * Criar *. Observe que, mesmo que você tenha ativado a geração automática, ainda é possível iniciar com segurança a geração manual. Geração de duplicatas para o mesmo período não é possível.
+ModuleCompanyCodeCustomerAquarium=%s seguido pelo código do cliente para um código de contabilidade do cliente
+ModuleCompanyCodeSupplierAquarium=%s seguido pelo código do fornecedor para um código de contabilidade do fornecedor
 ModuleCompanyCodePanicum=Retornar um código de contabilidade vazio.
 ModuleCompanyCodeDigitaria=O código de contabilidade depende do código de terceiros. O código é composto pelo caractere "C" na primeira posição seguida pelos primeiros 5 caracteres do código de terceiros.
 Use3StepsApproval=Por padrão, as ordens de compra precisam ser criadas e aprovadas por 2 utilisadores diferentes (um passo / utilisador para criar e um passo / utilisador para aprovar. Note que, se o utilisador tiver permissão para criar e aprovar, um passo / utilisador será suficiente) . Você pode solicitar esta opção para introduzir uma terceira etapa / aprovação do utilisador, se o valor for superior a um valor dedicado (então serão necessárias 3 etapas: 1 = validação, 2 = primeira aprovação e 3 = segunda aprovação se a quantidade for suficiente). 1 <br>Defina isto como vazio se uma aprovação (2 etapas) for suficiente, ajuste-o para um valor muito baixo (0,1) se uma segunda aprovação (3 etapas) for sempre necessária.
 UseDoubleApproval=Utilizar uma aprovação de 3 etapas quando o valor (sem impostos) for superior a...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not their, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your Email provider to get SMTP credentials for your account).
+WarningPHPMail=AVISO: Muitas vezes, é melhor configurar emails enviados para usar o servidor de email do seu provedor, em vez da configuração padrão. Alguns provedores de email (como o Yahoo) não permitem que você envie um email de outro servidor além do seu próprio servidor. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor do seu provedor de e-mail, portanto, alguns destinatários (o compatível com o protocolo DMARC) solicitarão ao seu provedor de e-mail se eles aceitam seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, então poucos dos seus e-mails enviados podem não ser aceitos (tome cuidado também com a cota de envio do seu provedor de e-mail). esta restrição, você deve alterar a configuração de e-mail para escolher o outro método "servidor SMTP" e digite o servidor SMTP e as credenciais fornecidas pelo seu provedor de e-mail (pergunte ao seu provedor de e-mail para obter credenciais de SMTP para sua conta).
 WarningPHPMail2=Se o seu serviço de e-mail SMTP restringir o cliente de e-mail a alguns endereços IP (muito raro), utilize o seguinte endereço IP da sua instalação ERP CRM Dolibarr: <strong>%s</strong>.
 ClickToShowDescription=Clique para mostrar a descrição
-DependsOn=This module needs the module(s)
+DependsOn=Este módulo precisa do (s) módulo (s)
 RequiredBy=Este módulo é necessário para o(s) módulo(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>Para que o formulário crie um novo treceiro, é<strong>%s</strong>,<br> se você quiser o valor padrão somente se url tiver algum parâmetro, você pode usar<strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+TheKeyIsTheNameOfHtmlField=Este é o nome do campo HTML. O conhecimento técnico é necessário para ler o conteúdo da página HTML para obter o nome da chave de um campo.
+PageUrlForDefaultValues=Você deve inserir o caminho relativo da página no URL. Se você incluir parâmetros em URL, os valores padrão serão efetivos se todos os parâmetros estiverem definidos para o mesmo valor.
+PageUrlForDefaultValuesCreate=<br> Exemplo: <br> Para o formulário para criar uma nova terceira parte, é <strong> %s </ strong>. <br> Para a URL dos módulos externos instalados no diretório personalizado, não inclua o "custom /", então use path como <strong> mymodule / mypage.php </ strong> e não customizado / mymodule / mypage.php. <br> Se você quiser o valor padrão somente se url tiver algum parâmetro, você pode usar <strong> %s </ forte>
+PageUrlForDefaultValuesList=<br> Exemplo: <br> Para a página que lista terceiros, é <strong> %s </ strong>. <br> Para URL dos módulos externos instalados no diretório customizado, não inclua o "custom /" assim use caminho como <strong> mymodule / mypagelist.php </ strong> e não customizado / mymodule / mypagelist.php. <br> Se você quer o valor padrão somente se o url tiver algum parâmetro, você pode usar <strong> %s </ strong >
 EnableDefaultValues=Permitir o uso de valores predefinidos personalizados
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+EnableOverwriteTranslation=Ativar o uso de tradução sobrescrita
+GoIntoTranslationMenuToChangeThis=Uma tradução foi encontrada para a chave com este código. Para alterar este valor, você deve editá-lo em Home-Setup-translation.
 WarningSettingSortOrder=Aviso, definir uma ordem de classificação padrão pode resultar em um erro técnico ao entrar na página da lista se o campo for um campo desconhecido. Se você tiver um erro desse tipo, volte para esta página para remover a ordem de classificação padrão e restaurar o comportamento padrão.
 Field=Campo
 ProductDocumentTemplates=Modelos de documento para gerar documento do produto
@@ -480,18 +480,18 @@ SendEmailsReminders=Envie lembretes da agenda por e-mails
 davDescription=Adicionar um componente para ser um servidor DAV
 DAVSetup=Configuração do módulo DAV
 DAV_ALLOW_PUBLIC_DIR=Ativar o diretório público (diretório WebDav sem necessidade de iniciar sessão)
-DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access  (in read and write mode), with no need to have/use an existing login/password account.
-DAV_ALLOW_ECM_DIR=Enable the root directy of DMS/ECM module (login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Like for the feature from the web interface, you will need a valid login/password with granted permissions to access it.
+DAV_ALLOW_PUBLIC_DIRTooltip=O diretório público WebDav é um diretório WebDAV que todos podem acessar (no modo de leitura e gravação), sem necessidade de ter / usar uma conta de login / senha existente.
+DAV_ALLOW_ECM_DIR=Ativar a diretiva raiz do módulo DMS / ECM (login obrigatório)
+DAV_ALLOW_ECM_DIRTooltip=O diretório raiz onde todos os arquivos são carregados manualmente ao usar o módulo DMS / ECM. Como para o recurso da interface da web, você precisará de um login / senha válido com permissões concedidas para acessá-lo.
 # Modules
 Module0Name=Utilizadores e Grupos
 Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
 Module1Name=Terceiros
-Module1Desc=Gestão de terceiros (empresas, particulares) e contactos
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Comercial
 Module2Desc=Gestão comercial
 Module10Name=Contabilidade
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Desc=Relatórios contábeis simples (periódicos, faturamento) com base no conteúdo do banco de dados. Não usa nenhuma tabela de razão.
 Module20Name=Orçamentos
 Module20Desc=Gestão de orçamentos
 Module22Name=Emails em massa
@@ -501,9 +501,9 @@ Module23Desc=Monitorização do consumo de energia
 Module25Name=Encomendas de clientes
 Module25Desc=Gestão de encomendas de clientes
 Module30Name=Faturas
-Module30Desc=Gestão de faturas e notas de crédito de clientes. Gestão de faturas de fornecedores
+Module30Desc=Gerenciamento de notas fiscais e notas de crédito para clientes. Gerenciamento de notas fiscais e notas de crédito para fornecedores
 Module40Name=Fornecedores
-Module40Desc=Suppliers and purchase management (purchase orders and billing)
+Module40Desc=Gestão de fornecedores e compras (pedidos e faturamento)
 Module42Name=Registos Debug
 Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração.
 Module49Name=Editores
@@ -517,13 +517,13 @@ Module52Desc=Gestão de stocks (produtos)
 Module53Name=Serviços
 Module53Desc=Gestão de serviços
 Module54Name=Contractos/Subscrições
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=Gestão de contratos (serviços ou assinaturas recorrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
 Module56Name=Central telefónica
 Module56Desc=Gestão de central telefónica
 Module57Name=Ordens de pagamento por débito direto
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module57Desc=Gerenciamento de ordens de pagamento de débito direto. Inclui a geração de arquivos SEPA para os países europeus.
 Module58Name=ClickToDial
 Module58Desc=Integração com um sistema ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -545,34 +545,34 @@ Module200Desc=Sincronização da diretoria LDAP
 Module210Name=PostNuke
 Module210Desc=Integração com PostNuke
 Module240Name=Exportações de dados
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Ferramenta para exportar dados Dolibarr (com assistência)
 Module250Name=Importação de dados
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Ferramenta para importar dados para o Dolibarr (com assistência)
 Module310Name=Membros
 Module310Desc=Gestão de membros de uma fundação
 Module320Name=Feed RSS
 Module320Desc=Adicionar feed RSS às páginas Dolibarr
 Module330Name=Marcadores e atalhos
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou externas às quais você acessa com frequência
+Module400Name=Projetos ou Leads
+Module400Desc=Gestão de projetos, leads / oportunidades e / ou tarefas. Você também pode atribuir qualquer elemento (fatura, pedido, proposta, intervenção, ...) a um projeto e obter uma visão transversal da visão do projeto.
 Module410Name=Webcalendar
 Module410Desc=Integração com Webcalendar
 Module500Name=Impostos e Despesas especiais
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Gestão de outras despesas (impostos de venda, impostos sociais ou fiscais, dividendos, ...)
 Module510Name=Pagamento dos salários dos empregados
-Module510Desc=Record and track employee payments
+Module510Desc=Registrar e acompanhar pagamentos de funcionários
 Module520Name=Empréstimo
 Module520Desc=Gestão de empréstimos
 Module600Name=Notificações sobre eventos comerciais
-Module600Desc=Send email notifications triggered by a business event, for users (setup defined on each user), third-party contacts (setup defined on each third party) or to defined emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders of agenda events, go into the setup of module Agenda.
+Module600Desc=Enviar notificações de email acionadas por um evento de negócios, para usuários (configuração definida em cada usuário), contatos de terceiros (configuração definida em cada terceiro) ou para emails definidos
+Module600Long=Observe que este módulo envia emails em tempo real quando ocorre um evento de negócios específico. Se você estiver procurando por um recurso para enviar lembretes por e-mail sobre eventos da agenda, entre na configuração do módulo Agenda.
 Module610Name=Variantes de produtos
-Module610Desc=Creation of product variants (color, size etc.)
+Module610Desc=Criação de variantes de produtos (cor, tamanho etc.)
 Module700Name=Donativos
 Module700Desc=Gestão de donativos
 Module770Name=Relatórios de despesas
-Module770Desc=Manage and claim expense reports (transportation, meal, ...)
+Module770Desc=Gerenciar e reivindicar relatórios de despesas (transporte, refeição, ...)
 Module1120Name=Orçamentos de fornecedor
 Module1120Desc=Solicitar orçamento e preços do fornecedor
 Module1200Name=Mantis
@@ -580,15 +580,15 @@ Module1200Desc=Integração com Mantis
 Module1520Name=Criação de documentos
 Module1520Desc=Produção do documento da emails em massa
 Module1780Name=Etiquetas/Categorias
-Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
+Module1780Desc=Criar tags / categoria (produtos, clientes, fornecedores, contatos ou membros)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Allow text fields to be edited using CKEditor
+Module2000Desc=Permitir que campos de texto sejam editados usando o CKEditor
 Module2200Name=Preços dinâmicos
 Module2200Desc=Permitir a utilização de expressões matemáticas para os preços
 Module2300Name=Tarefas agendadas
 Module2300Desc=Gestão de trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos/Agenda
-Module2400Desc=Track events. Let Dolibarr log automatic events for tracking purposes or record manual events or meetings. This is the main module for good Customer or Supplier Relationship Management.
+Module2400Desc=Provas de pista. Deixe que o Dolibarr registre eventos automáticos para fins de rastreamento ou registre eventos manuais ou reuniões. Este é o módulo principal para um bom gerenciamento de relacionamento com clientes ou fornecedores.
 Module2500Name=SGD / GEC
 Module2500Desc=Sistema de Gestão de Documentos / Gestão de Conteúdo Eletrónico. Organização automática dos seus documentos gerados ou armazenados. Compartilhe-os quando precisar.
 Module2600Name=Serviços API/Web (servidor SOAP)
@@ -596,50 +596,50 @@ Module2600Desc=Ativar o servidor SOAP do Dolibarr, fornecendo serviços API
 Module2610Name=Serviços API/Web (servidor REST)
 Module2610Desc=Ativar os serviços API do servidor REST do Dolibarr
 Module2660Name=Serviços Web de chamada (cliente SOAP)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Supplier orders currently supported.)
+Module2660Desc=Ativar o cliente de serviços da web Dolibarr (pode ser usado para enviar dados / solicitações para servidores externos. Apenas pedidos de fornecedores são suportados no momento.)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Use o serviço online Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (encontrados com seus e-mails). Precisa de acesso à Internet
 Module2800Desc=Cliente FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversões GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Adicionar um botão Skype nas fichas dos utilisador/terceiros/contactos/membros
 Module3200Name=Arquivos inalteráveis
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3200Desc=Ativar um registro inalterável de eventos de negócios. Eventos são arquivados em tempo real. O log é uma tabela somente leitura de eventos encadeados que podem ser exportados. Este módulo pode ser obrigatório para alguns países.
 Module4000Name=GRH
 Module4000Desc=Gestão de recursos humanos (gestão de departamento e contratos de funcionários)
 Module5000Name=Multiempresa
 Module5000Desc=Permite-lhe gerir várias empresas
 Module6000Name=Fluxo de trabalho
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Desc=Gerenciamento de fluxo de trabalho (criação automática de objeto e / ou mudança automática de status)
 Module10000Name=Sites da Web
 Module10000Desc=Crie sites públicos com um editor WYSIWYG. Basta configurar seu servidor web (Apache, Nginx, ...) para apontar para o diretório Dolibarr dedicado para tê-lo online na Internet com seu próprio nome de domínio.
 Module20000Name=Gestão de pedidos de licença
-Module20000Desc=Declare and track employees leave requests
+Module20000Desc=Declarar e rastrear funcionários deixar pedidos
 Module39000Name=Lotes de produtos
 Module39000Desc=Gestão de produtos por lotes ou números de série
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module40000Name=Multi Moeda
+Module40000Desc=Use moedas alternativas em preços e documentos
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50000Desc=Oferecer aos clientes uma página de pagamento online PayBox (cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, pedido, ...)
 Module50100Name=Ponto de vendas
 Module50100Desc=Modúlo de ponto de vendas (POS).
 Module50150Name=Ponto de vendas
-Module50150Desc=Point of sales module (Touch screen POS).
+Module50150Desc=Módulo de ponto de vendas (touch screen POS).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50200Desc=Oferecer aos clientes uma página de pagamento on-line do PayPal (conta do PayPal ou cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, pedido, ...)
 Module50400Name=Contabilidade (avançada)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Gestão contábil (dupla entrada, suporte geral e auxiliar). Exporte o ledger em vários outros formatos de software contábil.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=Impressão direta (sem abrir os documentos) usando a interface Cups IPP (a impressora deve estar visível no servidor e o CUPS deve estar instalado no servidor).
 Module55000Name=Votação ou Questionário
-Module55000Desc=Module to create online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module55000Desc=Módulo para criar enquetes, pesquisas ou votos on-line (como Doodle, Studs, Rdvz, ...)
 Module59000Name=Margens
 Module59000Desc=Módulo para gerir margens
 Module60000Name=Comissões
 Module60000Desc=Módulo para gerir comissões
 Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=Adicione recursos para gerenciar Incoterms
 Module63000Name=Recursos
 Module63000Desc=Gerir recursos (impressoras, carros, ...) que pode partilhar em eventos
 Permission11=Consultar faturas a clientes
@@ -661,9 +661,9 @@ Permission32=Criar/Modificar produtos
 Permission34=Eliminar produtos
 Permission36=Ver/Gerir produtos ocultos
 Permission38=Exportar produtos
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
+Permission41=Leia projetos e tarefas (projeto compartilhado e projetos para os quais eu sou contato). Também pode inserir o tempo consumido, para mim ou minha hierarquia, em tarefas atribuídas (Quadro de Horários)
+Permission42=Criar / modificar projetos (projeto compartilhado e projetos para os quais sou contato). Também pode criar tarefas e atribuir usuários a projetos e tarefas
+Permission44=Excluir projetos (projeto compartilhado e projetos para os quais sou contato)
 Permission45=Exportar projetos
 Permission61=Consultar intervenções
 Permission62=Criar/Modificar intervenções
@@ -696,7 +696,7 @@ Permission109=Eliminar envios
 Permission111=Consultar contas financeiras (contas bancárias, caixas)
 Permission112=Criar/modificar/eliminar e comparar trasações
 Permission113=Configurar as contas ficnanceiras (criar, gerir categorias)
-Permission114=Reconcile transactions
+Permission114=Reconciliar transações
 Permission115=Exportar transacções e extractos
 Permission116=Transferências entre contas
 Permission117=Gerir envio de cheques
@@ -704,15 +704,15 @@ Permission121=Consultar terceiros associados ao utilizador
 Permission122=Criar/modificar terceiros associados ao utilizador
 Permission125=Eliminar terceiros associados ao utilizador
 Permission126=Exportar terceiros
-Permission141=Read all projects and tasks (also private projects I am not a contact for)
-Permission142=Create/modify all projects and tasks (also private projects I am not a contact for)
+Permission141=Leia todos os projetos e tarefas (também projetos privados para os quais não sou um contato)
+Permission142=Criar / modificar todos os projetos e tarefas (também projetos privados para os quais não sou um contato)
 Permission144=Eliminar todos os projetos e tarefas (também os projetos privados para os quais não sou contactado)
 Permission146=Consultar fornecedores de rede
 Permission147=Consultar estados
 Permission151=Consultar ordens de pagamento por débito direto
 Permission152=Criar/modificar ordens de pagamento por débito direto
 Permission153=Enviar/transimitir ordens de pagamento por débito direto
-Permission154=Record Credits/Rejections of direct debit payment orders
+Permission154=Créditos de registro / rejeições de ordens de pagamento de débito direto
 Permission161=Consultar contratos/subscrições
 Permission162=Criar/modificar contratos/subscrições
 Permission163=Ativar um serviço/subscrição de um contrato
@@ -765,7 +765,7 @@ PermissionAdvanced253=Criar/modificar utilizadores internos/externos e permissõ
 Permission254=Criar/modificar apenas utilizadores externos
 Permission255=Modificar a palavra-passe de outros utilizadores
 Permission256=Eliminar ou desativar outros utilizadores
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative for).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Estender o acesso a todos os terceiros (não apenas terceiros que o usuário é um representante de venda para). <br> Não é eficaz para usuários externos (sempre limitado a si próprios para propostas, pedidos, faturas, contratos, etc.). eficaz para projetos (somente regras sobre permissões de projeto, visibilidade e atribuição de tarefas).
 Permission271=Consultar CA
 Permission272=Consultar faturas
 Permission273=Emitir fatura
@@ -775,7 +775,7 @@ Permission283=Eliminar contactos
 Permission286=Exportar contactos
 Permission291=Consultar tarifas
 Permission292=Definir permissões das tarifas
-Permission293=Modify customers tariffs
+Permission293=Modificar tarifas de clientes
 Permission300=Consultar códigos de barra
 Permission301=Criar/modificar códigos de barra
 Permission302=Eliminar código de barras
@@ -797,9 +797,9 @@ Permission401=Consultar descontos
 Permission402=Criar/modificar descontos
 Permission403=Validar descontos
 Permission404=Eliminar descontos
-Permission511=Read payments of salaries
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
+Permission511=Leia pagamentos de salários
+Permission512=Criar / modificar pagamentos de salários
+Permission514=Excluir pagamentos de salários
 Permission517=Exportar salários
 Permission520=Consultar empréstimos
 Permission522=Criar/modificar empréstimos
@@ -852,8 +852,8 @@ Permission1251=Executar importações em massa de dados externos para a bases de
 Permission1321=Exportar faturas, atributos e cobranças de clientes
 Permission1322=Reabrir uma fatura paga
 Permission1421=Exportar faturas e atributos de clientes
-Permission20001=Read leave requests (your leave and that of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and that of your subordinates)
+Permission20001=Leia pedidos de licença (sua licença e a dos seus subordinados)
+Permission20002=Crie / modifique seus pedidos de licença (sua licença e a de seus subordinados)
 Permission20003=Eliminar pedidos de licença
 Permission20004=Consultar todos os pedidos de licença (incluindo os dos utilizadores não são seus subordinados)
 Permission20005=Criar/modificar pedidos de licença de todos (incluindo os dos utilizadores não são seus subordinados)
@@ -888,8 +888,8 @@ Permission63001=Consultar recursos
 Permission63002=Criar/modificar recursos
 Permission63003=Eliminar recursos
 Permission63004=Associar recursos a eventos da agenda
-DictionaryCompanyType=Types of third-parties
-DictionaryCompanyJuridicalType=Legal forms of third-parties
+DictionaryCompanyType=Tipos de terceiros
+DictionaryCompanyJuridicalType=Formas legais de terceiros
 DictionaryProspectLevel=Nível de potencial da prospeção
 DictionaryCanton=Concelho
 DictionaryRegion=Distritos
@@ -899,10 +899,10 @@ DictionaryCivility=Títulos pessoais e profissionais
 DictionaryActions=Tipos de eventos da agenda
 DictionarySocialContributions=Tipos de impostos sociais ou fiscais
 DictionaryVAT=Taxa de IVA
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=Quantidade de selos fiscais
 DictionaryPaymentConditions=Condições de pagamento
 DictionaryPaymentModes=Métodos de pagamento
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Tipos de contatos / endereços
 DictionaryTypeOfContainer=Tipo de páginas/conteúdos do site
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formatos de Papel
@@ -916,47 +916,47 @@ DictionarySource=Origem dos orçamentos/encomendas
 DictionaryAccountancyCategory=Grupos personalizados para os relatórios
 DictionaryAccountancysystem=Modelos para o gráfíco de contas
 DictionaryAccountancyJournal=Diários contabilisticos
-DictionaryEMailTemplates=Email Templates
+DictionaryEMailTemplates=Templates de Email
 DictionaryUnits=Unidades
 DictionaryProspectStatus=Estado da prospeção
-DictionaryHolidayTypes=Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryHolidayTypes=Tipos de licença
+DictionaryOpportunityStatus=Status de lead para projeto / lead
 DictionaryExpenseTaxCat=Relatório de despesas - categorias de transporte
 DictionaryExpenseTaxRange=Relatório de despesas - Escala por categoria de transporte
 SetupSaved=Configuração guardada
 SetupNotSaved=A configuração não foi guardada
 BackToModuleList=Voltar à lista de módulos
-BackToDictionaryList=Back to list of Dictionaries
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sale Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sale Tax rate follows the active standard rule:<br>If the seller is not subject to Sale tax, then Sale tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sale tax by default equals the Sale tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default Sale tax is 0. This rule is dependant on the seller's country - please consult with your accountant. The Sale tax should be paid by the buyer to their customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community Sale tax number) then the Sale tax by defaults to the Sale tax of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community Sale tax number), then the Sale tax is 0 by default. End of rule.<br>In any other case the proposed default is Sale tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sale tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which Sale tax is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sale tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sale tax in franchise) and paid a franchise Sale tax without any Sale tax declaration.  This choice will display the reference "Non applicable Sale tax - art-293B of CGI" on invoices.
+BackToDictionaryList=Voltar para a lista de dicionários
+TypeOfRevenueStamp=Tipo de selo fiscal
+VATManagement=Gestão Fiscal de Venda
+VATIsUsedDesc=Por padrão, ao criar prospectos, faturas, pedidos, etc., a taxa do imposto sobre venda segue a regra padrão ativa: <br> Se o vendedor não estiver sujeito ao Imposto sobre vendas, o imposto sobre vendas será 0. Fim da regra. (país do vendedor = país do comprador), o Imposto sobre vendas por padrão é igual ao Imposto sobre vendas do produto no país do vendedor. Fim da regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e os bens forem produtos relacionados a transporte (transporte, transporte aéreo, companhia aérea), o imposto de venda padrão será 0. Essa regra depende do país do vendedor - por favor consulte seu contador. O imposto sobre a venda deve ser pago pelo comprador ao escritório de alfândega do país e não ao vendedor. Fim da regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e o comprador não for uma empresa (com um número de imposto de venda intracomunitário registrado), o Imposto sobre vendas será cobrado pela taxa de vendas do país do vendedor. . Fim da regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e o comprador for uma empresa (com um número de imposto de venda intracomunitário registrado), o Imposto sobre vendas será 0, por padrão. Fim da regra. <br> Em qualquer outro caso, o padrão proposto é imposto à venda = 0. Fim de regra.
+VATIsNotUsedDesc=Por padrão, o imposto de venda proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas.
+VATIsUsedExampleFR=Na França, significa empresas ou organizações que possuem um sistema fiscal real (real simplificado real ou normal). Um sistema no qual o imposto sobre venda é declarado.
+VATIsNotUsedExampleFR=Na França, significa associações que não são declaradas como Imposto de Vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresas (Imposto sobre vendas em franquia) e pagaram um Imposto sobre vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa opção exibirá a referência "Imposto sobre vendas não aplicável - art-293B de CGI" nas faturas.
 ##### Local Taxes #####
 LTRate=Taxa
 LocalTax1IsNotUsed=Não utilizar um segundo imposto
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=Use um segundo tipo de imposto (diferente do primeiro)
+LocalTax1IsNotUsedDesc=Não use outro tipo de imposto (diferente do primeiro)
 LocalTax1Management=Segundo tipo de imposto
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Não utilizar um terceiro imposto
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=Use um terceiro tipo de imposto (diferente do primeiro)
+LocalTax2IsNotUsedDesc=Não use outro tipo de imposto (diferente do primeiro)
 LocalTax2Management=Terceiro tipo de imposto
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Gestão
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsUsedDescES=A taxa de ER, por padrão, ao criar prospetos, faturas, ordens, etc., segue a regra padrão ativa: <br> Se o comprador não estiver sujeito a RE, o RE, por padrão, = 0. Fim da regra. <br> Se o comprador estiver sujeito a RE, então o RE será, por padrão. Fim da regra. <br>
 LocalTax1IsNotUsedDescES=Por padrão, o RE proposto é 0. Fim da regra.
 LocalTax1IsUsedExampleES=Em Espanha, eles são profissionais sujeitos a algumas secções específicas do IAE Espanhol.
 LocalTax1IsNotUsedExampleES=Em Espanha por exemplo, eles são profissionais e sociedades, sujeitos a certas secções do IAE Espanhol.
 LocalTax2ManagementES=Gestão de Imposto sobre o Rendimento das Pessoas Singulares (IRS)
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsUsedDescES=A taxa de IRPF por padrão ao criar prospetos, faturas, ordens etc. segue a regra padrão ativa: <br> Se o vendedor não estiver sujeito ao IRPF, então IRPF por padrão = 0. Fim da regra. <br> Se o vendedor estiver sujeito ao IRPF, o IRPF será, por padrão. Fim da regra. <br>
 LocalTax2IsNotUsedDescES=Por defeito, o IRS proposto é 0. Fim da regra.
 LocalTax2IsUsedExampleES=Em Espanha, os freelancers e profissionais liberais que prestam serviços e empresas que escolheram o regime fiscal dos módulos.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+LocalTax2IsNotUsedExampleES=Em Espanha, são empresas não sujeitas ao sistema fiscal de módulos.
 CalcLocaltax=Relatórios sobre impostos locais
 CalcLocaltax1=Vendas - Compras
 CalcLocaltax1Desc=Os relatórios de impostos locais são calculados através da diferença entre as vendas de impostos locais e as compras de impostos locais
@@ -966,7 +966,8 @@ CalcLocaltax3=Vendas
 CalcLocaltax3Desc=Os relatórios de impostos locais são o total de vendas de impostos locais
 LabelUsedByDefault=Etiqueta que será utilizada por defeito se não for encontrada tradução para este código
 LabelOnDocuments=Etiqueta sobre documentos
-LabelOrTranslationKey=Label or translation key
+LabelOrTranslationKey=Etiqueta ou chave de tradução
+ValueOfConstantKey=Valor da constante
 NbOfDays=N.º de dias
 AtEndOfMonth=No fim de mês
 CurrentNext=Atual/Seguinte
@@ -1005,7 +1006,7 @@ Skin=Tema
 DefaultSkin=Tema predefinido
 MaxSizeList=Tamanho máximo da lista
 DefaultMaxSizeList=Tamanho máximo predefinido para listas
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeShortList=Comprimento máximo padrão para listas curtas (ou seja, no cartão do cliente)
 MessageOfDay=Mensagem do día
 MessageLogin=Mensagem da página de inicio de sessão
 LoginPage=Página de inicio de sessão
@@ -1030,30 +1031,30 @@ OwnerOfBankAccount=Titular da conta bancária %s
 BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
 ShowBugTrackLink=Mostrar hiperligação "<strong>%s</strong>"
 Alerts=Alertas
-DelaysOfToleranceBeforeWarning=Delays before displaying an alert warning
-DelaysOfToleranceDesc=This screen allows you to define the delay before an alert is reported onscreen with a %s icon for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay (in days) before alert on purchase orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Delay (in days) before alert for cheque deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Delay (in days) before alert for expense reports to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The mandatory setup steps are the 2 first steps in the Setup menu, namely :
-SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customize the default behavior of Dolibarr (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
-SetupDescription5=Other Setup menu entries provides optional parameters.
+DelaysOfToleranceBeforeWarning=Atrasos antes de exibir um aviso de alerta
+DelaysOfToleranceDesc=Essa tela permite que você defina o atraso antes que um alerta seja relatado na tela com um ícone %s para cada elemento atrasado.
+Delays_MAIN_DELAY_ACTIONS_TODO=Atraso (em dias) antes do alerta sobre eventos planejados (eventos da agenda) ainda não concluídos
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Atraso (em dias) antes do alerta no projeto não fechado a tempo
+Delays_MAIN_DELAY_TASKS_TODO=Atraso (em dias) antes do alerta nas tarefas planejadas (tarefas do projeto) ainda não concluídas
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Atraso (em dias) antes do alerta em pedidos ainda não processados
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Atraso (em dias) antes do alerta em pedidos de compra ainda não processados
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Atraso (em dias) antes de alerta em propostas para fechar
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Atraso (em dias) antes do alerta em propostas não faturadas
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Atraso (em dias) antes do alerta nos serviços para ativar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Atraso (em dias) antes do alerta nos serviços vencidos
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Atraso (em dias) antes do alerta em faturas de fornecedor não pagas
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Atraso (em dias) antes do alerta em faturas de clientes não pagas
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Atraso (em dias) antes do alerta na reconciliação bancária pendente
+Delays_MAIN_DELAY_MEMBERS=Atraso (em dias) antes do alerta da taxa de associação atrasada
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Atraso (em dias) antes do alerta para depósito em cheque para fazer
+Delays_MAIN_DELAY_EXPENSEREPORTS=Atraso (em dias) antes do alerta para relatórios de despesas aprovarem
+SetupDescription1=Antes de começar a usar o Dolibarr, alguns parâmetros iniciais devem ser definidos e módulos ativados / configurados.
+SetupDescription2=Os passos de configuração obrigatórios são os dois primeiros passos no menu de configuração, a saber:
+SetupDescription3=<a href="%s"> %s -> %s </a> <br> Parâmetros básicos usados ​​para personalizar o comportamento padrão do Dolibarr (por exemplo, para recursos relacionados ao país).
+SetupDescription4=<a href="%s"> %s -> %s </a> <br> O Dolibarr ERP / CRM é uma coleção de muitos módulos / aplicativos, todos mais ou menos independentes. Os módulos relevantes para suas necessidades devem ser ativados e configurados. Novos itens / opções são adicionados aos menus com a ativação de um módulo.
+SetupDescription5=Outras entradas do menu de configuração fornecem parâmetros opcionais.
 LogEvents=Eventos de auditoria da segurança
-Audit=Auditoria
+Audit=Eventos de segurança
 InfoDolibarr=Sobre o Dolibarr
 InfoBrowser=Sobre o navegador
 InfoOS=Sobre o sistema operativo
@@ -1065,20 +1066,20 @@ BrowserName=Nome do navegador
 BrowserOS=Sistema operativo do navegador
 ListOfSecurityEvents=Listagem de eventos de segurança do Dolibarr
 SecurityEventsPurged=Os eventos de segurança purgados
-LogEventDesc=Pode ativar o registo de eventos de segurança Dolibarr aqui. Os administradores podem ver o seu conteúdo a través do menu <b>Ferramentas do sistema - Auditoria</b>. Atenção, esta funcionalidade pode consumir uma grande quantidade de espaço na base de dados.
+LogEventDesc=Você pode habilitar aqui o registro para eventos de segurança. Os administradores podem ver seu conteúdo no menu <b> %s - %s </ b>. Atenção, esse recurso pode consumir uma grande quantidade de dados no banco de dados.
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>utilizadores administradores</b>.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
 SystemAreaForAdminOnly=Esta área só é acessível aos utilizadores administradores. Nenhuma permissão do Dolibarr permite reduzir esta limitação.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
-AccountantFileNumber=File number
+CompanyFundationDesc=Edite as informações da empresa / entidade. Clique no botão "%s" ou "%s" na parte inferior da página.
+AccountantDesc=Edite os detalhes do seu contador / contabilista
+AccountantFileNumber=Número do arquivo
 DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a aparência do Dolibarr
 AvailableModules=Aplicações/módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá para a Área (Início->Configuração->Módulos).
 SessionTimeOut=Tempo limite para a sessão
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+SessionExplanation=Este número garante que a sessão nunca expirará antes deste atraso, se o limpador de sessão for feito pelo limpador de sessão do PHP Interno (e nada mais). O limpador de sessão interno do PHP não garante que a sessão irá expirar após esse atraso. Ele irá expirar, após este atraso, e quando o limpador de sessão for executado, então todo acesso <b> %s / %s </ b>, mas somente durante o acesso feito por outras sessões (se o valor for 0, significa que a limpeza da sessão é feito apenas por um processo externo). <br> Nota: em alguns servidores com um mecanismo de limpeza de sessão externa (cron em debian, ubuntu ...), as sessões podem ser destruídas após um período definido por uma configuração externa, não importa o que o valor inserido aqui é.
 TriggersAvailable=Acionadores disponíveis
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggersDesc=Triggers são arquivos que modificarão o comportamento do fluxo de trabalho do Dolibarr quando copiados no diretório <b> htdocs / core / triggers </ b>. Eles realizam novas ações, ativadas em eventos Dolibarr (criação de nova empresa, validação de fatura, ...).
 TriggerDisabledByName=Os acionadores neste ficheiro estão desativados pelo sufixo <b>-NORUN</b> presente no nome.
 TriggerDisabledAsModuleDisabled=Os acionadores neste ficheiro estão desativados porque o módulo <b>%s</b> está desativado.
 TriggerAlwaysActive=Os acionadores neste ficheiro estão sempre ativos, independentemente de quais são os módulos ativados.
@@ -1088,7 +1089,7 @@ DictionaryDesc=Insira todos os dados de referência. Você pode adicionar os seu
 ConstDesc=Esta página permite que modifique todos os outros parâmetros não disponíveis nas páginas anteriores. Estes são na sua maioria parâmetros reservados para programadores ou solução avançada de problemas. Para uma lista de opções <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">consulte aqui</a>.
 MiscellaneousDesc=Aqui são definidos todos os outros parâmetros relacionados com segurança.
 LimitsSetup=Configuração de limites/precisão
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+LimitsDesc=Você pode definir limites, precisões e otimizações usadas pelo Dolibarr aqui
 MAIN_MAX_DECIMALS_UNIT=Número de casas decimais máximo para os preços unitários
 MAIN_MAX_DECIMALS_TOT=Número de casas decimais máximo para os preços totais
 MAIN_MAX_DECIMALS_SHOWN=Número de casas decimais máximo para os valores mostrados na janela (Colocar <b>...</b> depois do número de casas decimais máximo quando o número for truncado)
@@ -1096,17 +1097,17 @@ MAIN_ROUNDING_RULE_TOT=Passo do intervalo de arredondamento (para os países ond
 UnitPriceOfProduct=Preço unitário líquido de um produto
 TotalPriceAfterRounding=Preço total (líquido/IVA/inclui impostos) após arredondamento
 ParameterActiveForNextInputOnly=Parâmetro efetivo somente para as próximas sessões
-NoEventOrNoAuditSetup=Ainda não foram registados eventos de segurança. Isto é comum no caso de "Auditoria" não estar ativa na página "Configuração->Segurança->Auditoria".
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
+NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado ainda. Isso pode ser normal se a auditoria não tiver sido ativada na página "Configuração - Segurança - Eventos".
+NoEventFoundWithCriteria=Nenhum evento de segurança foi encontrado para este critério de pesquisa.
 SeeLocalSendMailSetup=Verifique a configuração local de sendmail
 BackupDesc=Para realizar uma cópia de segurança completa do Dolibarr, deve:
 BackupDesc2=Guarde o conteúdo do diretório de documentos (<b>%s</b>) que contém todos ficheiros carregados e gerados (de forma a que inclua todos os ficheiros dump gerados no passo 1).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDesc3=Salve o conteúdo do seu banco de dados (<b> %s </ b>) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir.
 BackupDescX=O diretório arquivado deverá ser guardado num local seguro.
 BackupDescY=A cópia de segurança gerada deve ser armazenada num local seguro.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+BackupPHPWarning=Backup não pode ser garantido com este método. Um anterior recomendado.
 RestoreDesc=Para restaurar uma cópia de segurança do Dolibarr, você deve:
-RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc2=Restaure o arquivo archive (arquivo zip, por exemplo) do diretório de documentos para extrair a árvore de arquivos no diretório de documentos de uma nova instalação do Dolibarr ou no diretório de documentos atual (<b> %s </ b>).
 RestoreDesc3=Restaurar os dados, a partir de um ficheiro dump backup, na base de dados da nova instalação Dolibarr ou na base de dados da instalação atual (<b>%s</b>). Aviso: uma vez que a restauração esteja concluída, você deve usar um login/palavra passe, que existia quando o backup foi feito, para iniciar a sessão novamente. Para restaurar um backup da base de dados para a instalação atual, pode seguir este assistente.
 RestoreMySQL=Importação MySQL
 ForcedToByAModule= Esta regra é forçada a <b>a %s</b>, por um módulo ativo
@@ -1117,31 +1118,31 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Deve executar este comando a pa
 YourPHPDoesNotHaveSSLSupport=Funções SSL não estão disponíveis no seu PHP
 DownloadMoreSkins=Mais temas para descarregar
 SimpleNumRefModelDesc=Retorna o número de referência, com o formato %syymm-nnnn, onde "yy" é o ano, "mm" é o mês e "nnnn" é uma sequência.
-ShowProfIdInAddress=Show professional id with addresses on documents
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses on documents
+ShowProfIdInAddress=Mostrar ID profissional com endereços em documentos
+ShowVATIntaInAddress=Ocultar o número de IVA intracomunitário com endereços em documentos
 TranslationUncomplete=Tradução parcial
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Desativar vista meteorológica
 MeteoStdMod=Modo padrão
 MeteoStdModEnabled=Modo padrão ativado
 MeteoPercentageMod=Modo percentagem
 MeteoPercentageModEnabled=Modo percentagem ativado
 MeteoUseMod=Clique para usar %s
 TestLoginToAPI=Teste o login à API
-ProxyDesc=Some features of Dolibarr need to have internet access to work. Define here the parameters for this. If the Dolibarr server is behind a Proxy server, these parameters tell Dolibarr how to access the internet through it.
+ProxyDesc=Alguns recursos do Dolibarr precisam ter acesso à internet para funcionar. Defina aqui os parâmetros para isso. Se o servidor Dolibarr estiver atrás de um servidor Proxy, esses parâmetros informam ao Dolibarr como acessar a Internet através dele.
 ExternalAccess=Acesso externo
 MAIN_PROXY_USE=Utilizar um servidor proxy (se não, o acesso à internet é direto)
 MAIN_PROXY_HOST=Nome/Endereço de servidor proxy
 MAIN_PROXY_PORT=Porta do servidor proxy
 MAIN_PROXY_USER=Inicie a sessão para usar o servidor proxy
 MAIN_PROXY_PASS=Palavra-passe para utilizar o servidor proxy
-DefineHereComplementaryAttributes=Define any attributes not already available by default, that you want to be supported for %s here.
+DefineHereComplementaryAttributes=Defina quaisquer atributos que ainda não estejam disponíveis por padrão e que você queira que sejam suportados para %s aqui.
 ExtraFields=Atributos complementares
 ExtraFieldsLines=Atributos complementares (linhas)
 ExtraFieldsLinesRec=Atributos complementares (linhas de faturas de modelos)
 ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas da encomenda)
 ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura)
 ExtraFieldsThirdParties=Atributos complementares (terceiro)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Atributos complementares (contatos / endereço)
 ExtraFieldsMember=Atributos complementares (membro)
 ExtraFieldsMemberType=Atributos complementares (tipo de membro)
 ExtraFieldsCustomerInvoices=Atributos complementares (faturas)
@@ -1155,44 +1156,44 @@ AlphaNumOnlyLowerCharsAndNoSpace=somente caracteres alfanuméricos e minúsculas
 SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar emails, a configuração sendmail deve conter a opção -ba (o parâmetro mail.force_extra_parameters no seu ficheiro php.ini). Se alguns destinatários não receberem e-mails, tente editar este parâmetro PHP com mail.force_extra_parameters = -ba
 PathToDocuments=Caminhos de acesso a documentos
 PathDirectory=Diretório
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=O recurso para enviar e-mails usando o método "PHP mail direct" gerará uma mensagem de e-mail que pode não ser analisada corretamente por alguns servidores de e-mail recebidos. O resultado é que alguns e-mails não podem ser lidos por pessoas hospedadas por essas plataformas com bugs. Este é o caso de alguns provedores de Internet (Ex: Orange na França). Isso não é um problema com o Dolibarr ou PHP, mas com o servidor de recebimento de email. No entanto, você pode adicionar uma opção MAIN_FIX_FOR_BUGGED_MTA a 1 em Setup - Other para modificar o Dolibarr para evitar isso. No entanto, você pode ter problemas com outros servidores que usam estritamente o padrão SMTP. A outra solução (recomendada) é usar o método "biblioteca de soquete SMTP" que não tem desvantagens.
 TranslationSetup=Configuração da tradução
 TranslationKeySearch=Procurar uma chave ou texto de tradução
 TranslationOverwriteKey=Modificar o texto de uma tradução
 TranslationDesc=Como definir o idioma da aplicação exibido : <br>* Sistema amplo : menu <strong>Inicio->Configuração->Exibir </strong><br>*Por  utilizador: utilize o separador <strong>Configuração do ecrã do utilizador</strong>da ficha do utilizador (clique no nome do utilizador no topo do ecrã).
 TranslationOverwriteDesc=Pode substituir as entradas na seguinte tabela. Escolha o seu idioma no menu suspenso "%s", insira a chave da tradução em "%s" e a sua nova tradução em "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationOverwriteDesc2=Você pode usar a outra guia para ajudá-lo a saber qual chave de tradução deve ser usada
 TranslationString=Texto de tradução
 CurrentTranslationString=Texto de tradução atual
 WarningAtLeastKeyOrTranslationRequired=É necessário pelo menos um critério de pesquisa para a chave ou texto de tradução
 NewTranslationStringToShow=Novo texto de tradução a exibir
 OriginalValueWas=A tradução original foi alterada. O valor original era: <br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução '<strong> %s </ strong>' que não existe em nenhum arquivo de idioma
 TotalNumberOfActivatedModules=Aplicação/módulos ativados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho do PHP
 YesInSummer=Sim no verão
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are opened to external users (whatever the permissions of such users) and only if permissions are granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os seguintes módulos são abertos para usuários externos (quaisquer que sejam as permissões de tais usuários) e somente se as permissões forem concedidas:
 SuhosinSessionEncrypt=Sessão de armazenamento encriptada por Suhosin
 ConditionIsCurrently=A condição está atualmente %s
-YouUseBestDriver=You use driver %s which is the best driver available currently.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+YouUseBestDriver=Você usa o driver %s, que é o melhor driver disponível atualmente.
+YouDoNotUseBestDriver=Você usa o driver %s, mas o driver %s é recomendado.
+NbOfProductIsLowerThanNoPb=Você tem apenas produtos / serviços %s no banco de dados. Isso não requer nenhuma otimização específica.
 SearchOptim=Optimização da pesquisa
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+YouHaveXProductUseSearchOptim=Você tem produtos %s no banco de dados. Você deve adicionar a constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 em Home-Setup-Other. Limite a pesquisa ao início de strings, o que possibilita que o banco de dados use índices e você deve obter uma resposta imediata.
+BrowserIsOK=Você está usando o navegador da web %s. Este navegador está ok para segurança e desempenho.
+BrowserIsKO=Você está usando o navegador da web %s. Este navegador é conhecido por ser uma má escolha para segurança, desempenho e confiabilidade. Recomendamos o uso do Firefox, Chrome, Opera ou Safari.
 XDebugInstalled=XDebug está carregado.
 XCacheInstalled=XCache está carregada.
-AddRefInList=Display Customer/Supplier ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddAdressInList=Display Customer/Supplier adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+AddRefInList=Mostrar ref. De cliente / fornecedor lista de informações (lista de seleção ou caixa de combinação) e a maior parte do hiperlink. <br> Os Terceiros aparecerão com um formato de nome "CC12345 - SC45678 - The Big Company corp." em vez de "The Big Company corp".
+AddAdressInList=Exibir lista de informações de endereço de cliente / fornecedor (selecione lista ou caixa de combinação). Terceiros aparecerão com um formato de nome "The Big Company corp. - 21 jump street 123456 Cidade grande - EUA" em vez de "The Big Company corp".
+AskForPreferredShippingMethod=Peça o método de envio preferido para terceiros.
 FieldEdition=Edição do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (para preencher apenas se existir problemas de desvios de fuso horário)
 GetBarCode=Obter código de barras
 ##### Module password generation
 PasswordGenerationStandard=Devolve uma palavra-passe gerada pelo algoritmo interno Dolibarr: 8 caracteres no mínimo, contendo números e letras minúsculas.
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationNone=Não sugira uma senha gerada. A senha deve ser digitada manualmente.
 PasswordGenerationPerso=Retornar uma palavra-passe que esteja de acordo com sua configuração definida.
 SetupPerso=De acordo com a sua configuração
 PasswordPatternDesc=Descrição do padrão da palavra-passe
@@ -1205,31 +1206,31 @@ UserMailRequired=O email é obrigatório para poder criar um novo utilizador
 HRMSetup=Configuração do módulo "GRH"
 ##### Company setup #####
 CompanySetup=Configuração do módulo "Empresas"
-CompanyCodeChecker=Options for automatic generation of customer / vendor codes
-AccountCodeManager=Options for automatic generation of customer / vendor accounting codes
+CompanyCodeChecker=Opções para geração automática de códigos de cliente / fornecedor
+AccountCodeManager=Opções para geração automática de códigos contábeis de clientes / fornecedores
 NotificationsDesc=O funcionalidade "Notificações por email" permite que você envie mensagens automáticas para alguns eventos Dolibarr. Os destinatários das notificações podem ser definidos:
 NotificationsDescUser=* por utilizador, um utilizador de cada vez
-NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
+NotificationsDescContact=* por terceiros contatos (clientes ou fornecedores), um contato no momento.
 NotificationsDescGlobal=* ou definindo o recipiente de emails global no página de configuração do módulo
 ModelModules=Modelos de Documento
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Gere documentos de modelos OpenDocument (arquivos .ODT / .ODS do LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Marca d'água no documento rascunho
 JSOnPaimentBill=Ative a funcionalidade para preencher automaticamente as linhas de pagamento no formulário de pagamento
 CompanyIdProfChecker=Regras para as Id. Profissionais
 MustBeUnique=Deve ser único?
-MustBeMandatory=Mandatory to create third parties (if vat number or type of company defined) ?
+MustBeMandatory=Obrigatório para criar terceiros (se número de IVA ou tipo de empresa definido)?
 MustBeInvoiceMandatory=Obrigatório para validar faturas?
 TechnicalServicesProvided=Serviços técnicos fornecidos
 #####DAV #####
-WebDAVSetupDesc=This is the links to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that need an existing login account/password to access.
-WebDavServer=Root URL of %s server : %s
+WebDAVSetupDesc=Estes são os links para acessar o diretório WebDAV. Ele contém um diretório "público" aberto a qualquer usuário que saiba o URL (se o acesso ao diretório público for permitido) e um diretório "particular" que precise de uma conta / senha de login existente para acessar.
+WebDavServer=URL raiz do servidor %s: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Uma hiperligação de exportação para o formato <b>%s</b> está disponivel na seguinte hiperligação: %s
 ##### Invoices #####
 BillsSetup=Configuração do módulo "Faturas"
 BillsNumberingModule=Módulo de numeração de faturas e entregas
 BillsPDFModules=Modelo de documentos de faturas
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de faturas de acordo com o tipo de fatura
 PaymentsPDFModules=Modelos de documentos de pagamento
 CreditNote=Nota de crédito
 CreditNotes=Notas de crédito
@@ -1286,7 +1287,7 @@ AdherentLoginRequired= Gerir um login para cada membro
 AdherentMailRequired=O email é obrigatório para criar um novo membro
 MemberSendInformationByMailByDefault=Selecione para enviar email de confirmação aos membros (validação ou nova subscrição), está ativada por defeito
 VisitorCanChooseItsPaymentMode=O visitante pode escolher entre os modos de pagamento disponíveis
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by emails</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent.
+MEMBER_REMINDER_EMAIL=Ativar o lembrete automático <b> por e-mails </ b> das inscrições expiradas. Nota: O módulo <strong> %s </ strong> deve estar ativado e configurado corretamente para que o lembrete seja enviado.
 ##### LDAP setup #####
 LDAPSetup=Configuração do módulo "LDAP"
 LDAPGlobalParameters=Parâmetros globais
@@ -1355,11 +1356,11 @@ LDAPTestSynchroMemberType=Sincronização do tipo de membro do teste
 LDAPTestSearch= Testar pesquisa LDAP
 LDAPSynchroOK=Teste de sincronização realizado com sucesso
 LDAPSynchroKO=O teste de sincronização falhou
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Falha no teste de sincronização. Verifique se a conexão com o servidor está configurada corretamente e se permite atualizações LDAP
 LDAPTCPConnectOK=Conexão TCP ao servidor LDAP efetuada com sucesso (Servidor=%s, Porta=%s)
 LDAPTCPConnectKO=Falha de conexão TCP ao servidor LDAP (Servidor=%s, Porta=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Conecte / autentique ao servidor LDAP com êxito (Servidor = %s, Porta = %s, Admin = %s, Senha = %s)
+LDAPBindKO=Conectar / autenticar ao servidor LDAP falhou (Servidor = %s, Porta = %s, Admin = %s, Senha = %s)
 LDAPSetupForVersion3=Servidor LDAP configurado para a versão 3
 LDAPSetupForVersion2=Servidor LDAP configurado para a versão 2
 LDAPDolibarrMapping=Mapeamento Dolibarr
@@ -1372,8 +1373,8 @@ LDAPFieldLoginSamba=Nome de utilizador (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemplo: sambaccountname
 LDAPFieldFullname=Nome completo
 LDAPFieldFullnameExample=Exemplo: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordNotCrypted=Senha não criptografada
+LDAPFieldPasswordCrypted=Senha criptografada
 LDAPFieldPasswordExample=Exemplo: userPassword
 LDAPFieldCommonNameExample=Exemplo: cn
 LDAPFieldName=Nome
@@ -1421,41 +1422,41 @@ LDAPDescMembersTypes=Esta página permite que você defina o nome dos atributos
 LDAPDescValues=Os valores de exemplo foram construídos para o <b>OpenLDAP</b> com os seguintes esquemas carregados: <b>core.schema, cosine.schema, inetorgperson.schema</b>. Se você utiliza esses valores e o OpenLDAP, então modifique o seu ficheiro de configuração LDAP, <b>slapd.conf</b>, para carregar todos esses esquemas.
 ForANonAnonymousAccess=Para um acesso autentificado
 PerfDolibarr=Relatório de configuração/otimização de desempenho
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+YouMayFindPerfAdviceHere=Esta página fornece algumas verificações ou conselhos relacionados ao desempenho.
+NotInstalled=Não instalado, portanto, seu servidor não é retardado por isso.
 ApplicativeCache=Cache de aplicativo
 MemcachedNotAvailable=Não foi encontrada nenhuma cache da aplicação. Pode melhorar o desempenho, instalando um servidor de cache "Memcached" e um módulo que possa utilizar este servidor de cache.<br>Mais informação em  <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note que muitos provedores de hospedagem da Web não fornecem tais servidores de cache.
 MemcachedModuleAvailableButNotSetup=Encontrado módulo memcached para cache de aplicativo, mas a configuração deste não está completa.
 MemcachedAvailableAndSetup=O módulo memcached dedicado está ativo.
 OPCodeCache=Cache OPCode
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+NoOPCodeCacheFound=Nenhum cache OPCode encontrado. Talvez você esteja usando um cache OPCode diferente de XCache ou eAccelerator (bom), ou talvez você não tenha cache OPCode (muito ruim).
 HTTPCacheStaticResources=Cache HTTP para recursos estáticos (css, img, javascript)
 FilesOfTypeCached=Ficheiros do tipo %s são guardados na cache do servidor HTTP
 FilesOfTypeNotCached=Ficheiros do tipo %s não são guardados na cache do servidor HTTP
 FilesOfTypeCompressed=Ficheiros do tipo %s são comprimidos pelo servidor HTTP
 FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servidor HTTP
 CacheByServer=Cache pelo servidor
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=Por exemplo, usando a diretiva Apache "ExpiresByType image / gif A2592000"
 CacheByClient=Cache pelo navegador
 CompressionOfResources=Compressão das respostas HTTP
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=Por exemplo, usando a diretiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível com os navegadores atuais
-DefaultValuesDesc=Here you can define/force the default value you want to have when you create a new record, and/or default filters or sort order when your list records.
-DefaultCreateForm=Default values (to create on forms)
+DefaultValuesDesc=Aqui você pode definir / forçar o valor padrão que deseja ter ao criar um novo registro e / ou filtros padrão ou ordem de classificação quando a lista é registrada.
+DefaultCreateForm=Valores padrão (para criar em formulários)
 DefaultSearchFilters=Filtros de pesquisa predefinidos
 DefaultSortOrder=Pedidos de classificação padrão
 DefaultFocus=Campos de foco predefinidos
-DefaultMandatory=Mandatory form fields
+DefaultMandatory=Campos Obrigatórios
 ##### Products #####
 ProductSetup=Configuração do módulo "Produtos"
 ServiceSetup=Configuração do módulo "Serviços"
 ProductServiceSetup=Configuração do módulo "Produtos e Serviços"
 NumberOfProductShowInSelect=Nº máximo de produtos apresentados em listas (0=sem limite)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise as popup tooltip)
+ViewProductDescInFormAbility=Exibir descrições de produtos em formulários (caso contrário, como uma dica pop-up)
 MergePropalProductCard=Ative no separador "Ficheiros Anexados" do produto/serviço uma opção para unir o documento em PDF ao orçamento em PDF, se o produto/serviço estiver no orçamento
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+ViewProductDescInThirdpartyLanguageAbility=Exibir descrições de produtos no idioma do terceiro
+UseSearchToSelectProductTooltip=Além disso, se você tiver um grande número de produtos (> 100 000), poderá aumentar a velocidade definindo PRODUCT_DONOTSEARCH_ANYWHERE como 1 em Setup-> Other. A pesquisa será limitada ao início da string.
+UseSearchToSelectProduct=Espere até pressionar uma tecla antes de carregar o conteúdo da lista de combinação de produtos (isso pode aumentar o desempenho se você tiver um grande número de produtos, mas for menos conveniente)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predefinido para produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras predefinido para terceiros
 UseUnits=Defina uma unidade de medida para a "Quantidade" durante a edição das linhas de uma encomenda, orçamento ou fatura
@@ -1471,7 +1472,7 @@ SyslogFilename=Nome e caminho do ficheiro
 YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um ficheiro log no diretório de "documentos" do Dolibarr.
 ErrorUnknownSyslogConstant=A constante %s não é uma constante Syslog conhecida
 OnlyWindowsLOG_USER=O Windows apenas suporta LOG_USER
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+CompressSyslogs=Compactação e backup de arquivos de log de depuração (gerados pelo módulo Log para depuração)
 SyslogFileNumberOfSaves=Backups de registos
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure o trabalho agendado de limpeza para definir a frequência do registo da cópia de segurança
 ##### Donations #####
@@ -1516,7 +1517,7 @@ SendingsSetup=Configuração do módulo "Envios"
 SendingsReceiptModel=Modelo do recibo de expedição
 SendingsNumberingModules=Envios módulos numerados
 SendingsAbility=Suporte para guias de transporte para entregas a clientes
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=Na maioria dos casos, as folhas de remessa são usadas como folhas para entregas ao cliente (lista de produtos a serem enviados) e folhas recebidas e assinadas pelo cliente. Portanto, o recibo de entrega do produto é um recurso duplicado e raramente é ativado.
 FreeLegalTextOnShippings=Texto livre nas expedições
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulo de numeração de notas de entrega de produtos
@@ -1528,18 +1529,18 @@ AdvancedEditor=Editor avançado
 ActivateFCKeditor=Ativar editor avançado para:
 FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas de elementos (exceto produtos/services)
 FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linhas para todas as entidades (propostas, pedidos, faturas, etc ...). <font class = "warning"> Aviso: O uso dessa opção para este caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao criar arquivos PDF. </ font>
 FCKeditorForMailing= Criação/Edição WYSIWIG para emails em massa (Ferramentas->eMailing)
 FCKeditorForUserSignature=Criação/Edição WYSIWIG da assinatura do utilizador
 FCKeditorForMail=Criação/Edição WYSIWIG para todo o correio (exceto Ferramentas->eMailling)
 ##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database does not appear to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
-OSCommerceTestKo1=Connection to server '%s' succeeded but database '%s' could not be reached.
+OSCommerceErrorConnectOkButWrongDatabase=A conexão foi bem-sucedida, mas o banco de dados não parece ser um banco de dados OSCommerce (Chave %s não encontrada na tabela %s).
+OSCommerceTestOk=Conexão ao servidor '%s' no banco de dados '%s' com o usuário '%s' obtido com sucesso.
+OSCommerceTestKo1=A conexão com o servidor '%s' foi bem-sucedida, mas o banco de dados '%s' não pôde ser alcançado.
 OSCommerceTestKo2=A conexão ao servidor '%s' através do utilizador '%s'  não foi possível.
 ##### Stock #####
 StockSetup=Configuração do módulo Stock
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+IfYouUsePointOfSaleCheckModule=Se você usar o módulo Point of Sale (POS) fornecido por padrão ou um módulo externo, essa configuração pode ser ignorada pelo seu módulo POS. A maioria dos módulos PDV é projetada por padrão para criar uma fatura imediatamente e diminuir o estoque, independentemente das opções aqui. Portanto, se você precisar ou não de uma redução de estoque ao registrar uma venda no seu PDV, verifique também a configuração do seu módulo PDV.
 ##### Menu #####
 MenuDeleted=Menu eliminado
 Menus=Menus
@@ -1561,7 +1562,7 @@ DetailRight=Condição para mostrar menus cinza não autorizados
 DetailLangs=Nome do ficheiro. lang para a tradução de códigos de etiquetas
 DetailUser=Interno / Externo / Todos
 Target=Alvo
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Alvo para links (o topo do _blank abre uma nova janela)
 DetailLevel=Nivel (-1:menu superior, 0:principal, >0 menu e submenu)
 ModifMenu=Modificação do menu
 DeleteMenu=Eliminar entrada de menu
@@ -1570,13 +1571,13 @@ FailedToInitializeMenu=Falha ao inicializar o menu
 ##### Tax #####
 TaxSetup=Configuração do módulo "Impostos, impostos sociais ou fiscais e dividendos"
 OptionVatMode=Aplicação do IVA
-OptionVATDefault=Standard basis
+OptionVATDefault=Base padrão
 OptionVATDebitOption=Regime de competência
 OptionVatDefaultDesc=O IVA é aplicado:<br>- ao envio dos bens (é utilizada a data da fatura)<br>- sobre o pagamento dos serviços
 OptionVatDebitOptionDesc=O IVA é aplicado:<br>- ao envio dos bens (é utilizada a data da fatura)<br>- sobre a faturação (débito) dos serviços
-OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServices=Base de caixa para produtos e serviços
 OptionPaymentForProductAndServicesDesc=IVA é devido: <br> - em pagamento de mercadorias <br>- em pagamentos de serviços
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Horário de elegibilidade do IVA por padrão de acordo com a opção escolhida:
 OnDelivery=Na entrega
 OnPayment=No pagamento
 OnInvoice=Na fatura
@@ -1593,36 +1594,36 @@ AccountancyCodeBuy=Código de contabilidade de compras
 AgendaSetup=Configuração do módulo "Eventos e agenda"
 PasswordTogetVCalExport=Chave de autorização para exportação do link vcal.
 PastDelayVCalExport=Não exportar evento com mais de
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_USE_EVENT_TYPE=Use tipos de eventos (gerenciados no menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor padrão para o tipo de evento no formulário de criação de evento
+AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente esse tipo de evento no filtro de pesquisa da visualização da agenda
+AGENDA_DEFAULT_FILTER_STATUS=Definir automaticamente este status para eventos no filtro de pesquisa da visualização da agenda
 AGENDA_DEFAULT_VIEW=Qual é o separador que você deseja abrir por defeito quando seleciona o menu "Agenda"
 AGENDA_REMINDER_EMAIL=Ativar lembrete de eventos <b>por e-mails</b> (lembrar opção / atraso pode ser definido em cada evento). Nota: O módulo <strong>%s</strong>deve estar habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Ativar lembrete de evento <b> no navegador do usuário </ b> (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Ativar notificação sonora
 AGENDA_SHOW_LINKED_OBJECT=Mostrar o objeto associado na vista de agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuração do módulo "Click To Dial"
 ClickToDialUrlDesc=Uma chamada é efetuada quando o icon é clicado. No URL pode usar as tags:<br><b>__PHONETO__</b> que será substituída pelo número do destinatário<br><b>__PHONEFROM__</b> que será substituída pelo número do remetente<br><b>__LOGIN__</b> que será substituída pelo nome de utilizador da sua conta ClickToDial (definido no seu cartão de utilizador)<br><b>__PASS__</b>  que será substituída pela palavra-passe da sua conta ClickToDial (definida no seu cartão de utilizador).
-ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=Este módulo permite tornar os números de telefone clicáveis. Um clique neste ícone fará com que seu telefone ligue para o número de telefone. Isso pode ser usado para chamar um sistema de call center da Dolibarr que pode ligar para o número de telefone em um sistema SIP, por exemplo.
 ClickToDialUseTelLink=Usar apenas um link "tel:" em números de telefone
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use esse método se os usuários tiverem um softphone ou uma interface de software instalada no mesmo computador que o navegador e chamados quando você clicar em um link em seu navegador que comece com "tel:". Se você precisar de uma solução de servidor completa (sem necessidade de instalação de software local), deverá definir isso como "Não" e preencher o próximo campo.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Pontos de vendas
 CashDeskSetup=Configuração do módulo "Ponto de vendas"
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskThirdPartyForSell=Terceiro genérico padrão a ser usado para vendas
 CashDeskBankAccountForSell=Conta a ser usada para receber pagamentos em dinheiro
 CashDeskBankAccountForCheque= Conta a ser usada para receber pagamentos através de cheques
 CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos por cartões de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskDoNotDecreaseStock=Desativar a redução de estoque quando uma venda é feita a partir do ponto de venda (se "não", a redução de estoque é feita para cada venda feita a partir do PDV, independentemente da opção definida no módulo Estoque).
 CashDeskIdWareHouse=Forçar e restringir o armazém a usar para o decréscimo de stock
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabled=Diminuição de estoque do ponto de venda desativado
 StockDecreaseForPointOfSaleDisabledbyBatch=Decréscimo de stock a partir do Ponto de Venda não é compatível com a gestão de lotes
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskYouDidNotDisableStockDecease=Você não desativou a redução de estoque ao fazer uma venda no Ponto de venda. Por isso, é necessário um depósito.
 ##### Bookmark #####
 BookmarkSetup=Configuração do módulo "Marcadores"
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+BookmarkDesc=Este módulo permite gerenciar marcadores. Você também pode adicionar atalhos para quaisquer páginas Dolibarr ou sites externos no seu menu à esquerda.
 NbOfBoomarkToShow=Número máximo de marcadores a mostrar no menu esquerdo
 ##### WebServices #####
 WebServicesSetup=Configuração do módulo "Webservices"
@@ -1650,8 +1651,8 @@ ChequeReceiptsNumberingModule=Módulo de numeração para recibos de pagamento e
 MultiCompanySetup=Configuração do módulo "Multi-empresa"
 ##### Suppliers #####
 SuppliersSetup=Configuração do módulo "Fornecedor"
-SuppliersCommandModel=Complete template of purchase order (logo...)
-SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersCommandModel=Modelo completo do pedido de compra (logotipo ...)
+SuppliersInvoiceModel=Modelo completo de fatura de fornecedor (logotipo ...)
 SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=Se definido a "sim", não se esqueça de atribuir permissões a utilizadores ou grupos de utilizadores que possam efetuar a segunda aprovação
 ##### GeoIPMaxmind #####
@@ -1667,7 +1668,7 @@ ProjectsSetup=Configuração do módulo "Projetos"
 ProjectsModelModule=Modelo de documento para relatórios de projeto
 TasksNumberingModules=Módulo de numeração de tarefas
 TaskModelModule=Modelo de documento dos relatórios de tarefasl
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+UseSearchToSelectProject=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação do projeto. <br> Isso pode melhorar o desempenho se você tiver um grande número de projetos, mas é menos conveniente.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Períodos de contabilidade
@@ -1688,7 +1689,7 @@ NoAmbiCaracAutoGeneration=Em criação automática de referências não utilize
 SalariesSetup=Configuração do módulo "Salários"
 SortOrder=Ordenação
 Format=Formato
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
+TypePaymentDesc=0: tipo de pagamento do cliente, 1: tipo de pagamento do fornecedor, 2: tipo de pagamento de clientes e fornecedores
 IncludePath=Caminho para o dirétorio "include" (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas"
 TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa 
@@ -1700,8 +1701,8 @@ YouMayFindNotificationsFeaturesIntoModuleNotification=Poderá encontrar as opç
 ListOfNotificationsPerUser=Lista de notificações por utilizador*
 ListOfNotificationsPerUserOrContact=Lista de notificações por utilizador* ou por contact**
 ListOfFixedNotifications=Lista de notificações fixas
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoUserCardToAddMore=Vá até a guia "Notificações" de um usuário para adicionar ou remover notificações para usuários
+GoOntoContactCardToAddMore=Vá ao separador "Notificações" de um terceiro para adicionar ou remover as notificações de contactos/endereços
 Threshold=Limite
 BackupDumpWizard=Assistente para construir o ficheiro dump de backup da base de dados
 SomethingMakeInstallFromWebNotPossible=Instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
@@ -1710,8 +1711,8 @@ InstallModuleFromWebHasBeenDisabledByFile=Instalação de um módulo externo da
 ConfFileMustContainCustom=Instalar ou construir um módulo externo do aplicativo precisa salvar os arquivos do módulo no diretório. <strong>%s</strong>Para que este diretório seja processado pelo Dolibarr, você deve configurar seu <strong>conf/conf.php</strong> para adicionar as 2 linhas diretivas:<br><strong> $dolibarr_main_url_root_alt ='/ custom';</strong><br><strong> $dolibarr_main_document_root_alt='%s/ custom';</strong>
 HighlightLinesOnMouseHover=Realçar as linhas da tabela quando o rato passar sobre elas
 HighlightLinesColor=Realçar a cor da linha quando o rato passa por cima (manter vazio para não realçar)
-HighlightLinesChecked=Highlight color of the line when it is checked (keep empty for no highlight)
-TextTitleColor=Text color of Page title
+HighlightLinesChecked=Destaque a cor da linha quando esta estiver marcada (mantenha vazio para não destacar)
+TextTitleColor=Cor do texto do título da página
 LinkColor=Cor dos links
 PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe a cache do navegador depois de mudar este valor de forma a gravar as alterações
 NotSupportedByAllThemes=Funciona com os temas predefinidos, pode não ser suportado por temas externos
@@ -1720,22 +1721,22 @@ TopMenuBackgroundColor=Cor de fundo para o menu no topo
 TopMenuDisableImages=Ocultar imagens no menu do topo
 LeftMenuBackgroundColor=Cor de fundo para o menu à esquerda
 BackgroundTableTitleColor=A cor do fundo para a linha de título das tabelas
-BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextColor=Cor do texto para a linha de título da tabela
 BackgroundTableLineOddColor=A cor do fundo para as linhas ímpares da tabela
 BackgroundTableLineEvenColor=Cor de fundo para linhas pares da tabela
 MinimumNoticePeriod=Período mínimo de notificação (o seu pedido de licença deve ser feito antes deste período)
 NbAddedAutomatically=Número de dias adicionados ao contadores dos utilizadores (automaticamente) cada mês
 EnterAnyCode=Este campo contém uma referência para identificar a linha. Digite qualquer valor sem caracteres especiais.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+UnicodeCurrency=Entre aqui entre chaves, lista de números de bytes que representam o símbolo da moeda. Por exemplo: para $, insira [36] - para o brasil real R $ [82,36] - para €, insira [8364]
 ColorFormat=As cores RGB está no formato HEX, por exemplo: FF0000
 PositionIntoComboList=Posição da linha nas listas de seleção
 SellTaxRate=Taxa de imposto de venda
 RecuperableOnly=Sim para IVA "Não Percebido, mas Recuperável" dedicado a algum regiões ultramarinas da França. Mantenha o valor de "Não" em todos os outros casos.\n\n
 UrlTrackingDesc=Se a transportadora oferecer uma página da Internet para verificar o estado da sua encomenda, pode introduzi-lo aqui. Você pode usar a chave {TRACKID} nos  parâmetros do URL para que o sistema possa substituí-lo na ficha de expedição.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of lead, this amount may be multiplied by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+OpportunityPercent=Quando você cria um lead, você define uma quantidade estimada de projeto / lead. De acordo com o status do lead, esse valor pode ser multiplicado por essa taxa para avaliar o valor global que todas as suas oportunidades podem gerar. O valor é por cento (entre 0 e 100).
 TemplateForElement=Este registo modelo é dedicado a qual elemento
 TypeOfTemplate=Tipo de modelo
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+TemplateIsVisibleByOwnerOnly=O modelo é visível apenas para o proprietário
 VisibleEverywhere=Visível em todo lado
 VisibleNowhere=Visível em nenhum lado
 FixTZ=Corrigir Fuso Horário
@@ -1748,23 +1749,23 @@ MailToSendOrder=Encomendas de clientes
 MailToSendInvoice=Faturas a clientes
 MailToSendShipment=Envios
 MailToSendIntervention=Intervenções
-MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierRequestForQuotation=Solicitação de cotação
 MailToSendSupplierOrder=Ordens de compra
 MailToSendSupplierInvoice=Faturas do fornecedor
 MailToSendContract=Contratos
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Utilizadores
-MailToProject=Projects page
+MailToProject=Página de projetos
 ByDefaultInList=Mostrar por padrão na vista de lista
 YouUseLastStableVersion=Você possui a última versão estável
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta versão principal (sinta-se livre para usá-la nas suas páginas da Internet)
 TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se livre para usá-la nas suas páginas da Internet)
 ExampleOfNewsMessageForMajorRelease=O Dolibarr ERP e CRM %s está disponível. A versão %s é um grande lançamento com várias funcionalidades novas. Você pode transferi-lo a partir da área de downloads do portal https://www.dolibarr.org (subdiretório: versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para consultar a lista completa de alterações.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features or data structure change is present in this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, here you can enter a rule to have a price for each level autocalculated according to the price of first level, so you will have to only enter a price for the first level on each product. This page is here to save you time and can be useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+MultiPriceRuleDesc=Quando a opção "Vários níveis de preços por produto / serviço" está ativada, você pode definir preços diferentes (um por nível de preço) para cada produto. Para economizar seu tempo, aqui você pode inserir uma regra para ter um preço para cada nível autocalculado de acordo com o preço do primeiro nível, então você terá que inserir apenas um preço para o primeiro nível em cada produto. Esta página está aqui para economizar tempo e pode ser útil somente se os preços de cada nível forem relativos ao primeiro nível. Você pode ignorar esta página na maioria dos casos.
 ModelModulesProduct=Modelos para documentos de produto
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto define barcode number.
+ToGenerateCodeDefineAutomaticRuleFirst=Para gerar códigos automaticamente, você deve primeiro definir um gerente para definir automaticamente o número do código de barras.
 SeeSubstitutionVars=Veja a nota * para uma lista de possíveis variáveis ​​de substituição
 SeeChangeLog=Consulte o arquivo ChangeLog (somente em inglês)
 AllPublishers=Todos os editores
@@ -1785,64 +1786,69 @@ AddOtherPagesOrServices=Adicionar outras páginas ou serviços
 AddModels=Adicionar modelos de documento ou numeração
 AddSubstitutions=Adicionar substituições de chaves
 DetectionNotPossible=Deteção não é possível
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+UrlToGetKeyToUseAPIs=Url para obter o token para usar a API (uma vez que o token foi recebido, ele é salvo na tabela do usuário do banco de dados e deve ser fornecido em cada chamada da API)
 ListOfAvailableAPIs=Lista de APIs disponíveis
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+activateModuleDependNotSatisfied=O módulo "%s" depende do módulo "%s", que está faltando, então o módulo "%1$s" pode não funcionar corretamente. Por favor, instale o módulo "%2$s" ou desabilite o módulo "%1$s" se quiser estar a salvo de qualquer surpresa
+CommandIsNotInsideAllowedCommands=O comando que você está tentando executar não está na lista de comandos permitidos definidos no parâmetro <strong> $ dolibarr_main_restrict_os_commands </ strong> no arquivo <strong> conf.php </ strong>.
 LandingPage=Página Inicial
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+SamePriceAlsoForSharedCompanies=Se você usar um módulo multicompanhia, com a opção "Preço único", o preço também será o mesmo para todas as empresas se os produtos forem compartilhados entre os ambientes
 ModuleEnabledAdminMustCheckRights=O módulo foi ativado. As permissões para o(s) módulo(s) ativado(s) foram adicionadas apenas aos utilizadores administradores. Talvez seja necessário conceder permissões para outros utilizadores ou grupos manualmente.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+UserHasNoPermissions=Este usuário não tem permissões definidas
+TypeCdr=Use "Nenhum" se a data do prazo de pagamento for a data da fatura mais um delta em dias (delta é o campo "%s") <br> Use "No final do mês", se, após o delta, a data precisar ser aumentada para alcançar o final do mês (+ um opcional "%s" em dias) <br> Use "Atual / Próximo" para que a data de vencimento do pagamento seja o primeiro N do mês após delta (delta é campo "%s", N é armazenado no campo "%s")
 BaseCurrency=Moeda de referência da empresa (vá à configuração da empresa para alterar)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s está em conformidade com as leis francesas (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Este módulo %s está em conformidade com as leis francesas (Loi Finance 2016) porque o módulo Non Reversible Logs é ativado automaticamente.
+WarningInstallationMayBecomeNotCompliantWithLaw=Você está tentando instalar o módulo %s que é um módulo externo. Ativar um módulo externo significa que você confia no editor desse módulo e que tem certeza de que este módulo não afeta negativamente o comportamento do seu aplicativo e está em conformidade com as leis do seu país (%s). Se o módulo introduzir um recurso ilegal, você se torna responsável pelo uso de software ilegal.
 MAIN_PDF_MARGIN_LEFT=Margem esquerda do PDF
 MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
 MAIN_PDF_MARGIN_TOP=Margem superior do PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
-NothingToSetup=There is no specific setup to do for this module.
+NothingToSetup=Não há nenhuma configuração específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como "sim" se este grupo for uma computação de outros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Insira a regra de cálculo se o campo anterior foi definido como Sim (por exemplo, 'CODEGRP1 + CODEGRP2')
 SeveralLangugeVariatFound=Várias variantes de idiomas encontradas
-COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizen, you can store the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show on a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sale tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some record automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-CollectNow=Collect now
-DateLastResult=Date last collect
-LastResult=Last result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
-CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
-CodeLastResult=Result code of last collect
-NbOfEmailsInInbox=Number of email in source directory
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remover caracteres especiais
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpar valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=Responsável pela proteção de dados (DPO, Privacidade de dados ou contato GDPR)
+GDPRContactDesc=Se você armazenar dados sobre empresas / cidadãos europeus, você poderá armazenar o contato responsável pelo regulamento geral de proteção de dados aqui
+HelpOnTooltip=Texto de ajuda para mostrar na dica de ferramenta
+HelpOnTooltipDesc=Coloque texto ou uma chave de conversão aqui para o texto ser exibido em uma dica de ferramenta quando esse campo aparecer em um formulário
+YouCanDeleteFileOnServerWith=Você pode excluir este arquivo no servidor com a Linha de Comando: <br> %s
+ChartLoaded=Gráfico de conta carregado
+SocialNetworkSetup=Configuração do módulo Redes Sociais
+EnableFeatureFor=Ativar recursos para <strong> %s </ strong>
+VATIsUsedIsOff=Nota: A opção de utilizar o Imposto sobre vendas ou o IVA foi definida como <strong> Deslig. </ Strong> no menu %s - %s, pelo que o IVA ou IVA utilizado será sempre 0 para vendas.
+SwapSenderAndRecipientOnPDF=Trocar o remetente e o endereço do destinatário no PDF
+FeatureSupportedOnTextFieldsOnly=Atenção, recurso suportado apenas em campos de texto
+EmailCollector=Coletor de e-mail
+EmailCollectorDescription=Adicione um trabalho agendado e uma página de configuração para verificar regularmente as caixas de e-mail (usando o protocolo IMAP) e registre os e-mails recebidos em seu aplicativo, no lugar certo e / ou crie algum registro automaticamente (como leads).
+NewEmailCollector=Novo coletor de email
+EMailHost=Host do servidor IMAP de e-mail
+MailboxSourceDirectory=Diretório de origem da caixa de correio
+MailboxTargetDirectory=Diretório de destino da caixa de correio
+EmailcollectorOperations=Operações para fazer pelo coletor
+CollectNow=Recolher agora
+DateLastResult=Data da última coleta
+LastResult=Último resultado
+EmailCollectorConfirmCollectTitle=Confirmação de recebimento de email
+EmailCollectorConfirmCollect=Você quer executar a coleta para este coletor agora?
+NoNewEmailToProcess=Nenhum novo email (filtros correspondentes) para processar
+NothingProcessed=Nada feito
+XEmailsDoneYActionsDone=%s emails qualificados, %s emails processados ​​com sucesso (para registro %s / ações executadas) por coletor
+RecordEvent=Registrar evento de email
+CreateLeadAndThirdParty=Criar lead (e terceiros se necessário)
+CodeLastResult=Código de resultado da última coleta
+NbOfEmailsInInbox=Número de email no diretório de origem
+LoadThirdPartyFromName=Carregar terceiros do nome (somente carga)
+LoadThirdPartyFromNameOrCreate=Carregar terceiros do nome (criar, se não encontrado)
+WithDolTrackingID=O código de acompanhamento do Dolibarr foi encontrado
+WithoutDolTrackingID=ID de acompanhamento Dolibarr não encontrado
+FormatZip=Código postal
 ##### Resource ####
 ResourceSetup=Configuração do módulo Recursos
 UseSearchToSelectResource=Utilizar um formulário de pesquisa para escolher um recurso (em vez de uma lista)
 DisabledResourceLinkUser=Desativar funcionalidade que permite vincular um recurso aos utilizadores
 DisabledResourceLinkContact=Desativar funcionalidade que permite vincular um recurso aos contactos
 ConfirmUnactivation=Confirmar restauração do módulo
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+OnMobileOnly=Apenas na tela pequena (smartphone)
+DisableProspectCustomerType=Desativar o tipo de terceiro "cliente + cliente" (assim, o terceiro deve ser cliente ou cliente, mas não pode ser ambos)
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 1f8ec7673cd..de592c63663 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -31,18 +31,19 @@ ViewWeek=Vista semanal
 ViewPerUser=Vista por utilizador
 ViewPerType=Vista por tipo
 AutoActions= Preenchimento automático
-AgendaAutoActionDesc= Defina aqui os eventos para os quais deseja que o Dolibarr crie automaticamente um evento na agenda. Se não for seleccionada nenhuma opção, apenas as acções manuais serão incluídas na agenda. Seguimento automático de ações empresariais efetuadas em objetos (validação, mudanças de estado) não será guardado.
-AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação dos seus eventos do Dolibarr para um calendário externo (Thunderbird, calendário Google, ...)
+AgendaAutoActionDesc= Aqui você pode definir eventos que você deseja que o Dolibarr crie automaticamente na Agenda. Se nada estiver marcado, somente ações manuais serão incluídas nos registros e exibidas na Agenda. O rastreamento automático de ações de negócios feitas em objetos (validação, mudança de status) não será salvo.
+AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação de seus eventos Dolibarr para um calendário externo (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=Esta página permite declarar as fontes externas de calendários para ver os seus eventos na agenda do Dolibarr.
 ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automáticamente
-EventRemindersByEmailNotEnabled=Os lembretes de eventos por email não foram ativados na configuração do módulo Agenda
+EventRemindersByEmailNotEnabled=Os lembretes de eventos por email não foram ativados na configuração do módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s, criado
 ContractValidatedInDolibarr=Contrato %s, validado
-PropalClosedSignedInDolibarr=Orçamento %s, assinado
-PropalClosedRefusedInDolibarr=Orçamento %s, recusado
-PropalValidatedInDolibarr=Orçamento %s, validado
-PropalClassifiedBilledInDolibarr=Orçamento %s, classificado como faturado
+CONTRACT_DELETEInDolibarr=Contrato %s excluído
+PropalClosedSignedInDolibarr=Orçamento %s assinado
+PropalClosedRefusedInDolibarr=Orçamento %s recusado
+PropalValidatedInDolibarr=Orçamento %s validado
+PropalClassifiedBilledInDolibarr=Orçamento %s classificado como faturado
 InvoiceValidatedInDolibarr=Fatura %s, validada
 InvoiceValidatedInDolibarrFromPos=Fatura %s, validada a partir do ponto de venda
 InvoiceBackToDraftInDolibarr=Fatura %s, voltou ao estado de rascunho
@@ -68,10 +69,10 @@ OrderBilledInDolibarr=Encomenda %s, classificada como faturada
 OrderApprovedInDolibarr=Encomenda %s, aprovada
 OrderRefusedInDolibarr=Encomenda %s, recusada
 OrderBackToDraftInDolibarr=Encomenda %s, voltou ao estado de rascunho
-ProposalSentByEMail=Orçamento para cliente, %s, enviado por email
+ProposalSentByEMail=Orçamento de %s enviado por e-mail
 ContractSentByEMail=Contrato %s, enviado por email
 OrderSentByEMail=Encomenda de cliente, %s, enviada por email
-InvoiceSentByEMail=Fatura de cliente, %s, enviada por email
+InvoiceSentByEMail=Fatura a cliente, %s, enviada por email
 SupplierOrderSentByEMail=Encomenda a fornecedor, %s, enviada por email
 SupplierInvoiceSentByEMail=Fatura de fornecedor, %s, enviada por email
 ShippingSentByEMail=Expedição %s, enviada por email
@@ -100,7 +101,7 @@ AgendaUrlOptions3=<b>logina=%s</b> para restringir a produção para as acções
 AgendaUrlOptionsNotAdmin=<b>logina =!%s</b> para restringir a saída às ações que não pertencem ao utilizador <b>%s</b>.
 AgendaUrlOptions4=<b>logint =%s</b> para restringir a saída às ações atribuídas ao utilizador <b>%s</b> (proprietário e outros).
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para que apenas obtenha eventos vinculados ao projeto <b>__PROJECT_ID__ </b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> para excluir o evento automático.
+AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </ b> para excluir eventos automáticos.
 AgendaShowBirthdayEvents=Mostrar aniversários dos contactos
 AgendaHideBirthdayEvents=Ocultar aniversários dos contactos
 Busy=Ocupado
@@ -110,7 +111,7 @@ DefaultWorkingHours=Horas de trabalho pré-definidas no dia (Exemplo: 9-18)
 # External Sites ical
 ExportCal=Exportar calendário
 ExtSites=Importar calendários externos
-ExtSitesEnableThisTool=Mostrar calendários externos (definidos na configuração global) na agenda. Não afeta os calendários externos definidos pelos utilizadores.
+ExtSitesEnableThisTool=Mostrar calendários externos (definidos na configuração global) na Agenda. Não afeta calendários externos definidos pelos usuários.
 ExtSitesNbOfAgenda=Número de calendários
 AgendaExtNb=Calendário n.º %s
 ExtSiteUrlAgenda=URL para aceder ao ficheiro .ical
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 3d09203c613..c680b1a08b9 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banco
-MenuBankCash=Bank | Cash
+MenuBankCash=Banco | Caixa
 MenuVariousPayment=Pagamentos diversos
 MenuNewVariousPayment=Novo pagamento diverso
 BankName=Nome do banco
 FinancialAccount=Conta
 BankAccount=Conta bancária
 BankAccounts=Contas Bancárias
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Banco | Entradas
 ShowAccount=Mostrar Conta
 AccountRef=Ref. Conta financeira
 AccountLabel=Etiqueta Conta financeira
@@ -46,11 +46,11 @@ BankAccountDomiciliation=Domiciliação de Conta
 BankAccountCountry=Conta do país
 BankAccountOwner=Nome do proprietário da Conta
 BankAccountOwnerAddress=Direcção do proprietário da Conta
-RIBControlError=O controlo da chave indica que a informação desta Conta bancaria é incompleta ou incorrecta.
+RIBControlError=A verificação de integridade dos valores falha. Isso significa que as informações desse número de conta estão incompletas ou incorretas (verifique o país, números e IBAN).
 CreateAccount=Criar Conta
 NewBankAccount=Nova conta
-NewFinancialAccount=Nova Conta financeira
-MenuNewFinancialAccount=Nova Conta
+NewFinancialAccount=Nova conta financeira
+MenuNewFinancialAccount=Nova conta financeira
 EditFinancialAccount=Edição Conta
 LabelBankCashAccount=Etiqueta da Conta de Caixa
 AccountType=Tipo de Conta
@@ -76,26 +76,27 @@ TransactionsToConciliate=Entradas para reconciliar
 Conciliable=Conciliável
 Conciliate=Conciliar
 Conciliation=Conciliação
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Salvar apenas a instrução
+ReconciliationLate=Reconciliação atrasada
 IncludeClosedAccount=Incluir Contas fechadas
 OnlyOpenedAccount=Apenas contas abertas
 AccountToCredit=Conta de crédito
 AccountToDebit=Conta de débito
 DisableConciliation=Desactivar a função de Conciliação para esta Conta
 ConciliationDisabled=Função de Conciliação desactivada
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Vinculado a uma entrada conciliada
 StatusAccountOpened=Ativo
 StatusAccountClosed=Inativo
 AccountIdShort=Número
 LineRecord=Registo
 AddBankRecord=Adicionar entrada
 AddBankRecordLong=Adicionar entrada manualmente
-Conciliated=Reconciled
+Conciliated=Reconciliado
 ConciliatedBy=Conciliado por
 DateConciliating=Data Conciliação
 BankLineConciliated=Entrada reconciliada
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+Reconciled=Reconciliado
+NotReconciled=Não reconciliado
 CustomerInvoicePayment=Pagamento de cliente
 SupplierInvoicePayment=Pagamento a Fornecedor
 SubscriptionPayment=Pagamento Assinatura
@@ -103,8 +104,8 @@ WithdrawalPayment=Pagamento de retirada
 SocialContributionPayment=Pagamento da taxa social/fiscal
 BankTransfer=Transferência bancária
 BankTransfers=Transferencias bancarias
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+MenuBankInternalTransfer=Transferência interna
+TransferDesc=Transferência de uma conta para outra, Dolibarr vai escrever dois registros (um débito na conta de origem e um crédito na conta de destino). A mesma quantia (exceto sinal), rótulo e data serão usados ​​para essa transação)
 TransferFrom=De
 TransferTo=Para
 TransferFromToDone=A transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi criado.
@@ -116,28 +117,28 @@ ConfirmDeleteCheckReceipt=Tem a certeza que deseja eliminar este recibo do chequ
 BankChecks=Cheques
 BankChecksToReceipt=Cheques a aguardar depósito
 ShowCheckReceipt=Mostrar recibo de depósito
-NumberOfCheques=Nº de cheques
+NumberOfCheques=Não de cheque
 DeleteTransaction=Eliminar entrada
 ConfirmDeleteTransaction=Tem a certeza que deseja eliminar esta entrada?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+ThisWillAlsoDeleteBankRecord=Isto também eliminará a entrada bancária gerada
 BankMovements=Movimentos
 PlannedTransactions=Entradas previstas
 Graph=Gráficos
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Entradas bancárias e extrato de conta
 ExportDataset_banque_2=Comprovativo de depósito
 TransactionOnTheOtherAccount=Transacção sobre outra Conta
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Número de pagamento atualizado com sucesso
 PaymentNumberUpdateFailed=Não foi possivel modificar o número de pagamento
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Data de pagamento atualizada com sucesso
 PaymentDateUpdateFailed=Não foi possível modificar a data de pagamento
 Transactions=Transacção
 BankTransactionLine=Entrada bancária
-AllAccounts=All bank and cash accounts
+AllAccounts=Todas as contas bancárias e de caixa
 BackToAccount=Voltar à Conta
 ShowAllAccounts=Mostrar para todas as Contas
-FutureTransaction=Transacção futura. Não há forma de conciliar.
-SelectChequeTransactionAndGenerate=Selecione o que pretende incluir no recibo de depósito e clique em &quot;Criar&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+FutureTransaction=Transação no futuro. Não há como reconciliar.
+SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque e clique em "Criar".
+InputReceiptNumber=Escolha o extrato bancário relacionado com a conciliação. Use um valor numérico classificável: YYYYMM ou YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos
 ToConciliate=Para reconciliar?
 ThenCheckLinesAndConciliate=Em seguida, verifique as linhas presentes no extrato bancário e clique
@@ -146,20 +147,22 @@ AllRIB=Todos os BAN
 LabelRIB=Etiqueta BAN 
 NoBANRecord=Nenhum registro de BAN
 DeleteARib=Excluir registro BAN
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
+ConfirmDeleteRib=Tem certeza de que deseja excluir este registro BAN?
+RejectCheck=Cheque devolvido
+ConfirmRejectCheck=Tem certeza de que deseja marcar esta verificação como rejeitada?
+RejectCheckDate=Data em que o cheque foi devolvido
+CheckRejected=Cheque devolvido
+CheckRejectedAndInvoicesReopened=Cheque devolvido e faturas reabertas
+BankAccountModelModule=Modelos de documentos para contas bancárias
+DocumentModelSepaMandate=Modelo do mandato da SEPA. Útil para países europeus apenas no EEC.
+DocumentModelBan=Modelo para imprimir uma página com informações de BAN.
+NewVariousPayment=Novos pagamentos diversos
 VariousPayment=Pagamentos diversos
 VariousPayments=Pagamentos diversos
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+ShowVariousPayment=Mostrar pagamentos diversos
+AddVariousPayment=Adicionar pagamentos diversos
+SEPAMandate=Mandato SEPA
+YourSEPAMandate=Seu mandato SEPA
+FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index bfda3ffca81..54a8b7d7ece 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos em atraso
 BillsStatistics=Estatísticas das faturas a clientes
 BillsStatisticsSuppliers=Estatísticas das faturas de fornecedores
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseDispatchedInBookkeeping=Desativado porque a fatura foi enviada para a contabilidade
+DisabledBecauseNotLastInvoice=Desativado porque a fatura não pode ser apagada. Algumas faturas foram registradas após esta e irão criar furos no contador.
 DisabledBecauseNotErasable=Desativar porque não pode ser eliminado
 InvoiceStandard=Fatura Normal
 InvoiceStandardAsk=Fatura Normal
@@ -25,13 +25,13 @@ InvoiceProFormaAsk=Fatura Pró-Forma
 InvoiceProFormaDesc=A <b>Fatura Pró-Forma</b> é uma imagem de uma fatura, mas não tem valor contabilístico.
 InvoiceReplacement=Fatura de Substituição
 InvoiceReplacementAsk=Fatura de Substituição para a Fatura
-InvoiceReplacementDesc=A <b>Fatura de Substituição</b> é utilizada para cancelar e substituir completamente uma fatura sem ter sido recebido o pagamento. <br><br> Nota: apenas as faturas sem pagamento podem ser substituídas. Se a fatura de substituição ainda não estiver fechada, esta será automaticamente fechada para "abandonada".
+InvoiceReplacementDesc=<b> A fatura de substituição </ b> é usada para cancelar e substituir completamente uma fatura sem nenhum pagamento já recebido. <br> <br> Nota: Somente faturas sem pagamento podem ser substituídas. Se a fatura que você substituir ainda não estiver fechada, ela será automaticamente fechada para "abandonada".
 InvoiceAvoir=Nota de Crédito
 InvoiceAvoirAsk=Nota de crédito para corrigir a fatura
-InvoiceAvoirDesc=A <b>Nota de Crédito</b> é uma fatura negativa destinada a compensar um montante de uma fatura que difere do montante realmente pago (por haver pago de mais ou por devolução de produtos, por Exemplo).<br><br>Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.'
+InvoiceAvoirDesc=A <b> nota de crédito </ b> é uma fatura negativa usada para corrigir o fato de que uma fatura tem um valor que difere do valor realmente pago (por exemplo, o cliente pagou muito por engano ou não pagará completamente desde que retornou alguns produtos).
 invoiceAvoirWithLines=Criar Nota de Crédito com as linhas da fatura de origem
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Criar nota de crédito com fatura não paga de origem
+invoiceAvoirLineWithPaymentRestAmount=Nota de crédito para o restante valor não pago
 ReplaceInvoice=Retificar fatura %s
 ReplacementInvoice=Fatura de Substituição
 ReplacedByInvoice=Substituída pela Fatura %s
@@ -43,7 +43,7 @@ ConsumedBy=Consumida por
 NotConsumed=Não consumiu
 NoReplacableInvoice=Sem Faturas Retificáveis
 NoInvoiceToCorrect=Nenhuma Fatura para corrigir
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Era fonte de uma ou várias notas de crédito
 CardBill=Ficha da Fatura
 PredefinedInvoices=Faturas predefinidas
 Invoice=Fatura
@@ -62,12 +62,12 @@ PaymentBack=Reembolso
 CustomerInvoicePaymentBack=Reembolso
 Payments=Pagamentos
 PaymentsBack=Reembolsos
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Deseja converter este %s em um desconto absoluto? <br> O valor será economizado entre todos os descontos e poderá ser usado como um desconto para uma fatura atual ou futura para este cliente.
+ConfirmConvertToReducSupplier=Deseja converter este %s em um desconto absoluto? <br> O valor será guardado em todos os descontos e poderá ser usado como um desconto para uma fatura atual ou futura deste fornecedor.
 SupplierPayments=Pagamentos a Fornecedores
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos dos clientes
@@ -81,9 +81,9 @@ PaymentRule=Estado do Pagamento
 PaymentMode=Tipo de Pagamento
 PaymentTypeDC=Cartão de débito/crédito
 PaymentTypePP=PayPal
-IdPaymentMode=Payment type (id)
-CodePaymentMode=Payment type (code)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Tipo de pagamento (id)
+CodePaymentMode=Tipo de pagamento (código)
+LabelPaymentMode=Tipo de pagamento (etiqueta)
 PaymentModeShort=Tipo de Pagamento
 PaymentTerm=Tipo de Pagamento
 PaymentConditions=Condições de Pagamento
@@ -91,8 +91,8 @@ PaymentConditionsShort=Condições de Pagamento
 PaymentAmount=Montante a Pagar
 ValidatePayment=Validar pagamento
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a pagar
-HelpPaymentHigherThanReminderToPay=Atenção, o montante do pagamento de uma ou mais letras é maior do que o resto a pagar. <br> Edite sua entrada, caso contrário, confirmar e pensar sobre como criar uma nota de crédito do excesso recebido para cada fatura paga em excesso.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Atenção, o valor do pagamento de uma ou mais contas é maior do que o valor pendente a pagar. <br> Edite sua entrada, caso contrário, confirme e considere a criação de uma nota de crédito para o excesso recebido para cada fatura paga em excesso.
+HelpPaymentHigherThanReminderToPaySupplier=Atenção, o valor do pagamento de uma ou mais contas é maior do que o valor pendente a pagar. <br> Edite sua entrada, caso contrário, confirme e considere a criação de uma nota de crédito para o excesso pago por cada fatura paga em excesso.
 ClassifyPaid=Classificar como 'Pago'
 ClassifyPaidPartially=Classificar como 'Pago Parcialmente'
 ClassifyCanceled=Classificar como 'Abandonado'
@@ -109,19 +109,19 @@ CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar lembrete por E-mail
 DoPayment=Inserir pagamento
 DoPaymentBack=Inserir reembolso
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertToReduc=Marcar como crédito disponível
+ConvertExcessReceivedToReduc=Converter o excesso recebido em crédito disponível
+ConvertExcessPaidToReduc=Converter o excesso pago em desconto disponível
 EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Desativado porque o restante não pago é zero
 PriceBase=preço base
 BillStatus=Estado da fatura
 StatusOfGeneratedInvoices=Estado das faturas geradas
 BillStatusDraft=Rascunho (precisa de ser validado)
 BillStatusPaid=Paga
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Reembolso de nota de crédito ou marcado como crédito disponível
+BillStatusConverted=Pago (pronto para consumo na fatura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validado (precisa de ser paga)
 BillStatusStarted=Iniciada
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Fechada (Pendente de pagamento)
 BillStatusClosedPaidPartially=Paga (parcialmente)
 BillShortStatusDraft=Rascunho
 BillShortStatusPaid=Paga
-BillShortStatusPaidBackOrConverted=Reembolsada ou convertida
+BillShortStatusPaidBackOrConverted=Reembolsado ou convertido
+Refunded=Devolveu
 BillShortStatusConverted=Pago
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
@@ -141,32 +142,32 @@ BillShortStatusNotRefunded=Não reembolsado
 BillShortStatusClosedUnpaid=Fechada por pagar
 BillShortStatusClosedPaidPartially=Paga (parcialmente)
 PaymentStatusToValidShort=Por validar
-ErrorVATIntraNotConfigured=Número de IVA intracomunitário ainda não configurado
+ErrorVATIntraNotConfigured=Número de IVA intracomunitário ainda não definido
 ErrorNoPaiementModeConfigured=Nenhum modo de pagamento predefinido. Vá à página de configuração do módulo Fatura para corrigir.
 ErrorCreateBankAccount=Criar uma conta bancária e em seguida, vá para configuração do painel do modulo de fatura para definir métodos de pagamento
 ErrorBillNotFound=Fatura %s inexistente
-ErrorInvoiceAlreadyReplaced=Erro, está a tentar validar uma fatura que retifica a fatura %s. Mas esta última já se encontra retificada pela fatura %s.
+ErrorInvoiceAlreadyReplaced=Erro, você tentou validar uma fatura para substituir a fatura %s. Mas este já foi substituído pela nota fiscal %s.
 ErrorDiscountAlreadyUsed=Erro, a remessa está já assignada
 ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura deste tipo deve ter um montante negativo
 ErrorInvoiceOfThisTypeMustBePositive=Erro, uma fatura deste tipo deve ter um montante positivo
 ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que se encontra ainda em rascunho
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Essa parte ou outra já é usada para que as séries de descontos não possam ser removidas.
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Ações sobre a fatura
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Fatura de modelo / recorrente
+NoQualifiedRecurringInvoiceTemplateFound=Nenhuma fatura de modelo recorrente qualificada para geração.
+FoundXQualifiedRecurringInvoiceTemplate=Encontrado %s fatura (s) modelo (s) recorrente (s) qualificada (s) para geração.
+NotARecurringInvoiceTemplate=Não é uma fatura modelo recorrente
 NewBill=Nova fatura
 LastBills=Últimas %s faturas
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s supplier template invoices
+LatestTemplateInvoices=Últimas facturas modelo %s
+LatestCustomerTemplateInvoices=Últimas facturas de modelo de cliente %s
+LatestSupplierTemplateInvoices=Últimas facturas de modelo de fornecedor %s
 LastCustomersBills=Últimas %s faturas a clientes
 LastSuppliersBills=Últimas %s faturas de fornecedor
 AllBills=Todas as faturas
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Todas as faturas modelo
 OtherBills=Outras faturas
 DraftBills=Faturas rascunho
 CustomersDraftInvoices=Faturas provisórias a cliente
@@ -179,30 +180,31 @@ ConfirmClassifyPaidBill=Tem a certeza que pretende alterar a fatura <b>%s</b> pa
 ConfirmCancelBill=Tem a certeza que pretende cancelar a fatura <b>%s</b>?
 ConfirmCancelBillQuestion=Porque é que pretende classificar esta fatura como 'abandonada'?
 ConfirmClassifyPaidPartially=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de paga?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi paga completamente. Qual é o motivo para você fechar essa fatura?
+ConfirmClassifyPaidPartiallyReasonAvoir=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Regularizo o IVA com uma nota de crédito.
+ConfirmClassifyPaidPartiallyReasonDiscount=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Aceito perder o IVA sobre esse desconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu recupero o IVA neste desconto sem uma nota de crédito.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente devedor
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos devolvidos em parte
 ConfirmClassifyPaidPartiallyReasonOther=Por outra Razão
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Essa opção é possível se sua fatura contenha comentários adequados. (Exemplo: "Somente o imposto correspondente ao preço efetivamente pago dá direito à dedução")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Em alguns países, esta opção pode ser possível somente se a fatura conter a nota correta.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Essa escolha é possível se a sua fatura tiver recebido comentários adequados. (Exemplo «Apenas o imposto correspondente ao preço efetivamente pago dá direito à dedução»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Em alguns países, essa opção pode ser possível somente se sua fatura contiver notas corretas.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Esta eleição é a eleição que deve tomar-se sem as Outras não são aplicáveis
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=um <b>cliente devedor</b> é um cliente que não quer regularizar a sua divida.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Um <b> cliente ruim </ b> é um cliente que se recusa a pagar sua dívida.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta eleição é possível se o caso de pagamento incompleto é a raiz de uma devolução de parte dos produtos
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opção se qualquer outra opção não se adequar, por exemplo, na seguinte situação: <br> - o pagamento não foi concluído porque alguns produtos foram enviados de volta <br> - montante reivindicado é muito importante porque um desconto foi esquecido <br> Em todos os casos, quantidade sobre-reivindicada deve ser corrigida no sistema de contabilidade criando uma nota de crédito.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opção se todos os outros não forem adequados, por exemplo, na seguinte situação: - o pagamento não foi concluído porque alguns produtos foram remetidos de volta - o valor reivindicado é muito importante porque um desconto foi esquecido em todos os casos. over-claim deve ser corrigido no sistema de contabilidade, criando uma nota de crédito.
 ConfirmClassifyAbandonReasonOther=Outro
 ConfirmClassifyAbandonReasonOtherDesc=Esta opção será usada em todos os outros casos. Por exemplo, porque você planeia criar uma fatura de substituição.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmCustomerPayment=Você confirma essa entrada de pagamento para <b> %s </ b> %s?
+ConfirmSupplierPayment=Você confirma essa entrada de pagamento para <b> %s </ b> %s?
 ConfirmValidatePayment=Tem certeza de que deseja validar este pagamento? Nenhuma alteração pode ser efetuada assim que o pagamento for validado.
 ValidateBill=Validar fatura
 UnvalidateBill=Invalidar fatura
-NumberOfBills=Nº de faturas
-NumberOfBillsByMonth=Nb de faturas por mês
+NumberOfBills=N.ª de faturas
+NumberOfBillsByMonth=N.ª de faturas por mês
 AmountOfBills=Montante das faturas
+AmountOfBillsHT=Quantidade de faturas (líquidas de imposto)
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (sem IVA)
 ShowSocialContribution=Mostrar imposto social/fiscal
 ShowBill=Ver fatura
@@ -210,19 +212,19 @@ ShowInvoice=Ver fatura
 ShowInvoiceReplace=Ver fatura retificativa
 ShowInvoiceAvoir=Ver deposito
 ShowInvoiceDeposit=Mostrar fatura de adiantamento
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Mostrar fatura da situação
 ShowPayment=Mostrar pagamento
 AlreadyPaid=Já e
 AlreadyPaidBack=Já reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Já pago (sem notas de crédito e adiantamentos)
 Abandoned=Abandonada
 RemainderToPay=Restante a receber
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
+RemainderToTake=Quantidade remanescente a levar
+RemainderToPayBack=Montante restante para reembolso
 Rest=Pendente
 AmountExpected=Montante reclamado
 ExcessReceived=Recebido em excesso
-ExcessPaid=Excess paid
+ExcessPaid=Excesso pago
 EscompteOffered=Desconto oferecido
 EscompteOfferedShort=Desconto
 SendBillRef=Submissão da fatura %s
@@ -238,11 +240,11 @@ RemainderToBill=Restante a faturar
 SendBillByMail=Enviar fatura por email
 SendReminderBillByMail=Enviar um lembrete por E-Mail
 RelatedCommercialProposals=Orçamentos relacionados
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Faturas recorrentes de clientes relacionadas
 MenuToValid=A Confirmar
-DateMaxPayment=Payment due on
+DateMaxPayment=Pagamento devido em
 DateInvoice=Data da fatura
-DatePointOfTax=Point of tax
+DatePointOfTax=Ponto de imposto
 NoInvoice=Nenhuma fatura
 ClassifyBill=Classificar a fatura
 SupplierBillsToPay=Faturas de fornecedores pendentes de pagamento
@@ -252,7 +254,7 @@ SetConditions=Definir termos de pagamento
 SetMode=Definir modo de pagamento
 SetRevenuStamp=Definir selo fiscal
 Billed=Faturado
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Faturas recorrentes
 RepeatableInvoice=Fatura Modelo
 RepeatableInvoices=Faturas Modelo
 Repeatable=Modelo
@@ -260,9 +262,9 @@ Repeatables=Modelos
 ChangeIntoRepeatableInvoice=Converter em fatura modelo
 CreateRepeatableInvoice=Criar fatura modelo
 CreateFromRepeatableInvoice=Criar a partir da fatura modelo
-CustomersInvoicesAndInvoiceLines=Faturas a clientes e linhas de faturas
+CustomersInvoicesAndInvoiceLines=Faturas de clientes e detalhes da fatura
 CustomersInvoicesAndPayments=Faturas a clientes e pagamentos
-ExportDataset_invoice_1=Faturas a clientes e linhas de faturas
+ExportDataset_invoice_1=Faturas de clientes e detalhes da fatura
 ExportDataset_invoice_2=Faturas a clientes e pagamentos
 ProformaBill=Fatura pró-forma:
 Reduction=Redução
@@ -273,8 +275,8 @@ Discounts=Descontos
 AddDiscount=Adicionar Desconto
 AddRelativeDiscount=Criar desconto relativo
 EditRelativeDiscount=Editar desconto relativo
-AddGlobalDiscount=Adicionar Desconto fixo
-EditGlobalDiscounts=Editar descontos absolutos
+AddGlobalDiscount=Criar desconto fixo
+EditGlobalDiscounts=Editar descontos fixos
 AddCreditNote=Criar nota de crédito
 ShowDiscount=Ver o deposito
 ShowReduc=Mostrar a dedução
@@ -282,32 +284,32 @@ RelativeDiscount=Desconto relativo
 GlobalDiscount=Desconto fixo
 CreditNote=Deposito
 CreditNotes=Recibos
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Notas de crédito ou excesso recebido
 Deposit=Adiantamento
 Deposits=Adiantamentos
 DiscountFromCreditNote=Desconto resultante do deposito %s
 DiscountFromDeposit=Adiantamentos da fatura %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Pagamentos em excesso da fatura %s
+DiscountFromExcessPaid=Pagamentos em excesso da fatura %s
 AbsoluteDiscountUse=Este tipo de crédito pode ser usado na fatura antes da sua validação
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=Novo Desconto fixo
-NewRelativeDiscount=Nova parente desconto
-DiscountType=Discount type
+CreditNoteDepositUse= A fatura deve ser validada para utilizar este tipo de crédito
+NewGlobalDiscount=Novo desconto fixo
+NewRelativeDiscount=Novo desconto relativo
+DiscountType=Tipo de desconto
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+DiscountStillRemaining=Descontos ou créditos disponíveis
+DiscountAlreadyCounted=Descontos ou créditos já consumidos
+CustomerDiscounts=Descontos para clientes
+SupplierDiscounts=Descontos de fornecedores
 BillAddress=Morada de faturação
-HelpEscompte=Este desconto é um desconto concedido ao cliente porque o pagamento foi feito antes do prazo.
-HelpAbandonBadCustomer=Este Montante é deixado (cliente julgado como devedor) e se considera como uma perda excepcional.
-HelpAbandonOther=Esse montante foi abandonado, pois foi um erro (cliente ou fatura incorretos substituídos por outro por exemplo)
-IdSocialContribution=Social/fiscal tax payment id
+HelpEscompte=Esse desconto é um desconto concedido ao cliente porque o pagamento foi feito antes do prazo.
+HelpAbandonBadCustomer=Este montante foi abandonado (o cliente disse ser um cliente ruim) e é considerado uma perda excepcional.
+HelpAbandonOther=Este montante foi abandonado, pois foi um erro (cliente errado ou fatura substituída por outro, por exemplo)
+IdSocialContribution=ID de pagamento de imposto social / fiscal
 PaymentId=ID de Pagamento
-PaymentRef=Payment ref.
+PaymentRef=Ref. De pagamento
 InvoiceId=ID da fatura
 InvoiceRef=Ref. da fatura
 InvoiceDateCreation=Data de criação da fatura
@@ -321,80 +323,80 @@ InvoiceNotChecked=Nenhuma fatura selecionada
 CloneInvoice=Clonar fatura
 ConfirmCloneInvoice=Tem a certeza que pretende clonar esta fatura <b>%s</b>?
 DisabledBecauseReplacedInvoice=Ação desativada porque a fatura foi substituída
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb de pagamentos
+DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos feitos para despesas especiais. Somente registros com pagamento durante o ano fixo são incluídos aqui.
+NbOfPayments=N.ª de pagamentos
 SplitDiscount=Dividido em duas desconto
-ConfirmSplitDiscount=Tem a certeza que pretende dividir este desconto de <b>%s</b> %s em 2 descontos menores?
-TypeAmountOfEachNewDiscount=Entrada montante para cada uma das duas partes:
-TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual ao montante original de desconto.
+ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b> %s </ b> %s em dois descontos menores?
+TypeAmountOfEachNewDiscount=Quantidade de entrada para cada uma das duas partes:
+TotalOfTwoDiscountMustEqualsOriginal=O total de dois novos descontos deve ser igual ao valor do desconto original.
 ConfirmRemoveDiscount=Tem certeza que deseja remover este desconto?
 RelatedBill=Fatura relacionada
 RelatedBills=Faturas relacionadas
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
+RelatedCustomerInvoices=Faturas de clientes relacionadas
+RelatedSupplierInvoices=Faturas de fornecedores relacionadas
 LatestRelatedBill=Última fatura relacionada
-WarningBillExist=Aviso, já existe uma ou mais faturas
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+WarningBillExist=Atenção, uma ou mais faturas já existem
+MergingPDFTool=Ferramenta de fusão de PDF
+AmountPaymentDistributedOnInvoice=Quantia de pagamento distribuída na fatura
+PaymentOnDifferentThirdBills=Permitir pagamentos em contas de terceiros diferentes, mas mesma empresa-mãe
+PaymentNote=Nota de pagamento
+ListOfPreviousSituationInvoices=Lista de faturas de situação anterior
+ListOfNextSituationInvoices=Lista de faturas de próxima situação
+ListOfSituationInvoices=Lista de faturas de situação
+CurrentSituationTotal=Situação atual total
+DisabledBecauseNotEnouthCreditNote=Para remover uma fatura de situação do ciclo, o total dessa nota de crédito da fatura deve cobrir esse total de faturas
+RemoveSituationFromCycle=Remover esta fatura do ciclo
+ConfirmRemoveSituationFromCycle=Remover esta fatura %s do ciclo?
+ConfirmOuting=Confirme a saída
 FrequencyPer_d=Cada %s dias
 FrequencyPer_m=Cada %s meses
 FrequencyPer_y=Cada %s anos
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
+FrequencyUnit=Unidade de frequência
+toolTipFrequency=Exemplos: <br> <b> Definir 7, Dia </ b>: fornecer uma nova fatura a cada 7 dias <br> <b> Definir 3, Mês </ b>: fornecer uma nova fatura a cada 3 meses
+NextDateToExecution=Data para a próxima geração de fatura
+NextDateToExecutionShort=Data da próxima geração
+DateLastGeneration=Data da última geração
+DateLastGenerationShort=Data mais recente gen.
+MaxPeriodNumber=Número máximo de geração de fatura
+NbOfGenerationDone=Número de geração de faturas já efetuadas
+NbOfGenerationDoneShort=Número de geração feito
+MaxGenerationReached=Número máximo de gerações atingidas
 InvoiceAutoValidate=Validar faturas automaticamente
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
+GeneratedFromRecurringInvoice=Gerado a partir do modelo de fatura recorrente %s
+DateIsNotEnough=Data ainda não atingida
+InvoiceGeneratedFromTemplate=Fatura %s gerada a partir da fatura modelo recorrente %s
+WarningInvoiceDateInFuture=Atenção, a data da fatura é maior que a data atual
+WarningInvoiceDateTooFarInFuture=Atenção, a data da fatura está muito longe da data atual
+ViewAvailableGlobalDiscounts=Ver descontos disponíveis
 # PaymentConditions
 Statut=Estado
 PaymentConditionShortRECEP=Pronto Pagamento
 PaymentConditionRECEP=Pronto Pagamento
 PaymentConditionShort30D=30 dias
 PaymentCondition30D=30 dias
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 dias do final do mês
+PaymentCondition30DENDMONTH=Dentro de 30 dias após o final do mês
 PaymentConditionShort60D=60 dias
 PaymentCondition60D=60 dias
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 dias do final do mês
+PaymentCondition60DENDMONTH=Dentro de 60 dias após o final do mês
 PaymentConditionShortPT_DELIVERY=Envio
 PaymentConditionPT_DELIVERY=Na entrega
 PaymentConditionShortPT_ORDER=Pedido
 PaymentConditionPT_ORDER=Ao encomendar
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% adiantado, 50%% na entrega
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+PaymentConditionShort10D=10 dias
+PaymentCondition10D=10 dias
+PaymentConditionShort10DENDMONTH=10 dias do final do mês
+PaymentCondition10DENDMONTH=Dentro de 10 dias após o final do mês
+PaymentConditionShort14D=14 dias
+PaymentCondition14D=14 dias
+PaymentConditionShort14DENDMONTH=14 dias do final do mês
+PaymentCondition14DENDMONTH=Dentro de 14 dias após o final do mês
 FixAmount=Valor fixo
 VarAmount=Quantidade variável (%% total.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountOneLine=Quantidade variável (%% tot.) - 1 linha com o rótulo '%s'
 # PaymentType
 PaymentTypeVIR=Transferência bancária
 PaymentTypeShortVIR=Transferência bancária
@@ -406,21 +408,21 @@ PaymentTypeCB=Cartão de crédito
 PaymentTypeShortCB=Cartão de crédito
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=DICA (Documentos contra pagamento)
+PaymentTypeShortTIP=SUGESTÃO DE PAGAMENTO
 PaymentTypeVAD=Pagamento online
 PaymentTypeShortVAD=Pagamento online
 PaymentTypeTRA=Letra bancária
 PaymentTypeShortTRA=Rascunho
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeFAC=Fator
+PaymentTypeShortFAC=Fator
 BankDetails=Dados bancários
 BankCode=Código banco
-DeskCode=Código sucursal
+DeskCode=Código do Office
 BankAccountNumber=Número conta
-BankAccountNumberKey=Dígito Control
+BankAccountNumberKey=Verifique os dígitos
 Residence=Débito Direto
-IBANNumber=Código IBAN
+IBANNumber=Número completo da conta do IBAN
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=Código BIC/SWIFT
@@ -428,7 +430,7 @@ ExtraInfos=Informações complementarias
 RegulatedOn=Regulado em
 ChequeNumber=Cheque nº
 ChequeOrTransferNumber=Cheque/Transferência nº
-ChequeBordereau=Check schedule
+ChequeBordereau=Verifique o horário
 ChequeMaker=Transmissor do Cheque/Transferência
 ChequeBank=Banco do cheque
 CheckBank=Verificar
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Pagamento por transferência na seguinte cont
 VATIsNotUsedForInvoice=* IVA não aplicável  art-293B do CGI
 LawApplicationPart1=Por aplicação da lei 80.335 de 12/05/80
 LawApplicationPart2=As mercadorias permanecem em propriedade de
-LawApplicationPart3=Vendedor até o completo cobrança de
+LawApplicationPart3=o vendedor até o pagamento integral
 LawApplicationPart4=As suas preços
 LimitedLiabilityCompanyCapital=SRL com capital de
 UseLine=Aplicar
@@ -460,10 +462,10 @@ ChequesReceipts=Ficha emissão de cheques
 ChequesArea=Área emissão de cheques
 ChequeDeposits=Depósito de cheques
 Cheques=Cheques
-DepositId=Id deposit
-NbCheque=Number of checks
+DepositId=Depósito de identificação
+NbCheque=Número de cheques
 CreditNoteConvertedIntoDiscount=Esta nota de crédito %s, foi convertida no desconto %s
-UsBillingContactAsIncoiveRecipientIfExist=Utilizar a morada do contacto de cliente de faturação da fatura em vez da morada do Terceiro como destinatário das faturas
+UsBillingContactAsIncoiveRecipientIfExist=Usar contato / endereço com o tipo "contato de cobrança" em vez do endereço de terceiros como destinatário das faturas
 ShowUnpaidAll=Mostrar todas as faturas não pagas
 ShowUnpaidLateOnly=Mostrar apenas faturas atrasadas não pagas
 PaymentInvoiceRef=Pagamento da fatura %s
@@ -474,26 +476,27 @@ Reported=Atrasado
 DisabledBecausePayments=Não é possível, pois há alguns pagamentos
 CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento, uma vez que existe pelo menos uma fatura classificada como paga
 ExpectedToPay=Pagamento esperado
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Não é possível remover o pagamento reconciliado
 PayedByThisPayment=Pago por esse pagamento
-ClosePaidInvoicesAutomatically=Classificar como "Paga" todas as faturas padrão, adiantamentos ou de substituição completamente pagas.
+ClosePaidInvoicesAutomatically=Classifique "Pago" todas as faturas padrão, iniciais ou de substituição pagas totalmente.
 ClosePaidCreditNotesAutomatically=Classificar como "Paga" todas as notas de crédito totalmente reembolsadas.
-ClosePaidContributionsAutomatically=Classificar como "Pago" todas as contribuições sociais ou fiscais totalmente pagas.
-AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem pagamentos em falta serão automaticamente fechadas e classificadas como "Pagas".
+ClosePaidContributionsAutomatically=Classifique "Pago" todas as contribuições sociais ou fiscais pagas inteiramente.
+AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem saldo a pagar serão fechadas automaticamente com o status "Pago".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Lista de faturas não pagas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista apenas contém fatura de terceiros dos quais você está definido como representante de vendas.
 RevenueStamp=Selo fiscal
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+YouMustCreateInvoiceFromThird=Essa opção só está disponível ao criar faturas na guia "cliente" de terceiros
+YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao criar faturas na guia "fornecedor" de terceiros
+YouMustCreateStandardInvoiceFirstDesc=Você precisa criar uma fatura padrão primeiro e convertê-la em "modelo" para criar uma nova fatura modelo
 PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo completo de fatura (modelo recomendado)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
+PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
+TerreNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard e %syymm-nnnn para notas de crédito em que yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
+MarsNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard, %syymm-nnnn para facturas de substituição, %syymm-nnnn para facturas de adiantamento e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem voltar para 0
 TerreNumRefModelError=Uma conta a começar com $syymm já existe e não é compatível com este modelo de sequencia. Remove-o ou renomeia para activar este modulo
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard, %syymm-nnnn para notas de crédito e %syymm-nnnn para facturas de adiantamento onde yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Representante que dá seguimento à fatura do cliente
 TypeContact_facture_external_BILLING=Contacto na fatura do cliente
@@ -502,47 +505,48 @@ TypeContact_facture_external_SERVICE=Contactar o serviço ao cliente
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Representante de vendas que dá seguimento à fatura do fornecedor
 TypeContact_invoice_supplier_external_BILLING=Contacto na fatura do fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Fornecedor Contactar com transporte
-TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
+TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
+InvoiceFirstSituationAsk=Fatura da primeira situação
+InvoiceFirstSituationDesc=As <b> faturas de situação </ b> estão vinculadas a situações relacionadas a uma progressão, por exemplo, a progressão de uma construção. Cada situação está vinculada a uma fatura.
+InvoiceSituation=Fatura de situação
+InvoiceSituationAsk=Fatura seguindo a situação
+InvoiceSituationDesc=Crie uma nova situação seguindo uma já existente
+SituationAmount=Valor da fatura da situação (líquida)
+SituationDeduction=Subtração de situação
 ModifyAllLines=Modificar todas as linhas
 CreateNextSituationInvoice=Criar situação seguinte
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+ErrorFindNextSituationInvoice=Erro incapaz de encontrar a próxima referência do ciclo da situação
+ErrorOutingSituationInvoiceOnUpdate=Não é possível exibir essa fatura de situação.
+ErrorOutingSituationInvoiceCreditNote=Não é possível apresentar a nota de crédito vinculada.
 NotLastInCycle=Esta fatura não é a mais recente no ciclo e não deve ser modificada.
 DisabledBecauseNotLastInCycle=A situação seguinte já existe.
 DisabledBecauseFinal=Esta situação é final.
-situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_AS=COMO
 situationInvoiceShortcode_S=Dom
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+CantBeLessThanMinPercent=O progresso não pode ser menor que seu valor na situação anterior.
 NoSituations=Sem situações abertas
 InvoiceSituationLast=Fatura geral e final
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+PDFCrevetteSituationNumber=Situação N ° %s
+PDFCrevetteSituationInvoiceLineDecompte=Fatura de situação - COUNT
+PDFCrevetteSituationInvoiceTitle=Fatura de situação
+PDFCrevetteSituationInvoiceLine=Situação N ° %s: Inv. N ° %s em %s
+TotalSituationInvoice=Situação total
+invoiceLineProgressError=O progresso da linha de fatura não pode ser maior ou igual à próxima linha de fatura
+updatePriceNextInvoiceErrorUpdateline=Erro: atualização do preço na linha da fatura: %s
+ToCreateARecurringInvoice=Para criar uma fatura recorrente para este contrato, primeiro crie esse rascunho de fatura, converta-o em um modelo de fatura e defina a frequência de geração de faturas futuras.
+ToCreateARecurringInvoiceGene=Para gerar faturas futuras de forma regular e manual, basta acessar o menu <strong> %s - %s - %s </ strong>.
+ToCreateARecurringInvoiceGeneAuto=Se você precisar gerar essas faturas automaticamente, peça ao seu administrador para ativar e configurar o módulo <strong> %s </ strong>. Note que ambos os métodos (manual e automático) podem ser usados ​​juntos sem risco de duplicação.
 DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+ConfirmDeleteRepeatableInvoice=Tem certeza de que deseja excluir a fatura do modelo?
+CreateOneBillByThird=Crie uma fatura por terceiro (caso contrário, uma fatura por pedido)
+BillCreated=%s projeto (s) criado (s)
 StatusOfGeneratedDocuments=Estado da geração de documentos
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+DoNotGenerateDoc=Não gerar arquivo de documento
+AutogenerateDoc=Auto gerar arquivo de documento
+AutoFillDateFrom=Definir data de início para a linha de serviço com data da fatura
+AutoFillDateFromShort=Definir data de início
+AutoFillDateTo=Definir data final para a linha de serviço com a próxima data da fatura
+AutoFillDateToShort=Definir data final
+MaxNumberOfGenerationReached=Número máximo de gen. alcançado
+BILL_DELETEInDolibarr=Fatura eliminada
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index fb9a4bb4eac..1e1aa0dc6f9 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Mostrar empresa
 ShowStock=Mostrar armazém
 DeleteArticle=Clique para remover este artigo
 FilterRefOrLabelOrBC=Procurar (Ref/Etiqueta)
-UserNeedPermissionToEditStockToUsePos=Você pede para diminuir o stock ao criar a fatura, para que o utilizador que use o Ponto de Venda necessite de permissão para editar o stock.
+UserNeedPermissionToEditStockToUsePos=Você pede para diminuir o estoque na criação da fatura, portanto, o usuário que usa o POS precisa ter permissão para editar o estoque.
 DolibarrReceiptPrinter=Impressora de Recibos Dolibarr
+PointOfSale=Ponto de vendas
+PointOfSaleShort=POS
+CloseBill=Fechar Bill
+Floors=Andares
+Floor=Chão
+AddTable=Adicionar mesa
+Place=Lugar, colocar
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Encomendar impressoras
+SearchProduct=Pesquisar produto
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index c9a3d30d49c..2cbe59b9476 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -50,8 +50,9 @@ ActionAffectedTo=Acção assignada a
 ActionDoneBy=Acção realizada por
 ActionAC_TEL=Chamada telefónica
 ActionAC_FAX=Enviar fax
-ActionAC_PROP=Envío orçamento por correio
+ActionAC_PROP=Envío de orçamento por correio
 ActionAC_EMAIL=Enviar email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Reuniões
 ActionAC_INT=Intervenção no local
 ActionAC_FAC=Enviar fatura do cliente por correio
@@ -69,11 +70,11 @@ ActionAC_AUTO=Eventos inseridos automaticamente
 ActionAC_OTH_AUTOShort=Auto
 Stats=Estatísticas de venda
 StatusProsp=Estado da prospeção
-DraftPropals=Orçamentos em rascunho
+DraftPropals=Orçamentos rascunhos
 NoLimit=Sem limite
 ToOfferALinkForOnlineSignature=Link para assinatura online
-WelcomeOnOnlineSignaturePage=Bem-vindo à página onde pode aceitar orçamentos de %s
-ThisScreenAllowsYouToSignDocFrom=Esta página permite que você aceite e assine, ou recuse um orçamento
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=Esta página permite-lhe aceitar e assinar, ou recusar um orçamento/cotação
 ThisIsInformationOnDocumentToSign=Esta é a informação no documento para aceitar ou recusar
-SignatureProposalRef=Assinatura do orçamento%s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Recurso para assinatura online desativado ou este documento foi criado antes que o recurso fosse ativado
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 431010fdfd1..9c149d3b2ff 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -25,7 +25,7 @@ ThirdPartyContact=Contacto de Terceiro
 Company=Empresa
 CompanyName=Razão social
 AliasNames=Pseudónimo (comercial, marca registada, ...)
-AliasNameShort=Alias Name
+AliasNameShort=Nome do alias
 Companies=Empresas
 CountryIsInEEC=País faz parte da Comunidade Económica Europeia
 ThirdPartyName=Nome do Terceiro
@@ -38,9 +38,9 @@ ThirdPartyCustomers=Clientes
 ThirdPartyCustomersStats=Clientes
 ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s
 ThirdPartySuppliers=Fornecedores
-ThirdPartyType=Type of company
+ThirdPartyType=Tipo de Empresa
 Individual=Particular
-ToCreateContactWithSameName=Will create a Third Party and a linked Contact/Address with same information as the Third Party. In most cases, even if your Third Party is a physical person, creating a Third Party alone is enough.
+ToCreateContactWithSameName=Criará um terceiro e um contato / endereço vinculado com as mesmas informações do terceiro. Na maioria dos casos, mesmo que seu Terceiro seja uma pessoa física, criar um terceiro é suficiente.
 ParentCompany=Empresa-mãe
 Subsidiaries=Subsidiárias
 ReportByMonth=Relatório por mês
@@ -76,11 +76,11 @@ Town=Localidade
 Web=Web
 Poste= Posição
 DefaultLang=Idioma predefinido
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsed=Imposto sobre vendas usado
+VATIsUsedWhenSelling=Isso define se esse terceiro inclui um imposto de venda ou não quando faz uma fatura para seus próprios clientes
 VATIsNotUsed=Não sujeito a IVA
 CopyAddressFromSoc=Preencha a morada com a morada do terceiro
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiros nem cliente nem fornecedor, nenhum objeto de referência disponível
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=O terceiro não é cliente nem fornecedor, descontos não estão disponíveis
 PaymentBankAccount=Conta bancária de pagamentos
 OverAllProposals=Orçamentos
@@ -258,7 +258,7 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Sales Tax/VAT ID
+VATIntra=Imposto sobre vendas / ID do IVA
 VATIntraShort=Número de identificação para efeitos de IVA
 VATIntraSyntaxIsValid=Sintaxe Válida
 VATReturn=Retorno do IVA
@@ -274,8 +274,8 @@ CompanyHasRelativeDiscount=Este cliente tem um desconto por defeito de <b>%s%%</
 CompanyHasNoRelativeDiscount=Este cliente não tem descontos relativos por defeito
 HasRelativeDiscountFromSupplier=Você tem um desconto predefinido de <b> %s%%</b> deste fornecedor
 HasNoRelativeDiscountFromSupplier=Você não tem desconto relativo predefinido deste fornecedor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Este cliente tem descontos disponíveis (notas de créditos ou adiantamentos) para <b> %s </ b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente tem descontos disponíveis (comerciais, adiantamentos) para <b> %s </ b> %s
 CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=Você não tem desconto ou nota de crédito disponível neste fornecedor
 HasAbsoluteDiscountFromSupplier=Você tem descontos disponíveis (notas de créditos ou adiantamentos) para <b>%s</b> %s deste fornecedor
@@ -303,22 +303,22 @@ AddThirdParty=Criar terceiro
 DeleteACompany=Eliminar uma Empresa
 PersonalInformations=Informação Pessoal
 AccountancyCode=Conta contabilistica
-CustomerCode=Customer Code
+CustomerCode=Código do Consumidor
 SupplierCode=Código de Fornecedor
-CustomerCodeShort=Customer Code
+CustomerCodeShort=Código do Consumidor
 SupplierCodeShort=Código de Fornecedor
-CustomerCodeDesc=Customer Code, unique for all customers
+CustomerCodeDesc=Código do cliente, exclusivo para todos os clientes
 SupplierCodeDesc=Código de Fornecedor, exclusivo para todos os fornecedores
 RequiredIfCustomer=Requerida se o Terceiro for Cliente ou Cliente Potencial
 RequiredIfSupplier=Obrigatório se os terceiros forem fornecedores
-ValidityControledByModule=Validity controlled by module
-ThisIsModuleRules=Rules for this module
+ValidityControledByModule=Validade controlada pelo módulo
+ThisIsModuleRules=Regras para este módulo
 ProspectToContact=Cliente Potencial a Contactar
 CompanyDeleted=A Empresa "%s" foi Eliminada
 ListOfContacts=Lista de Contactos
 ListOfContactsAddresses=Lista de Contactos
-ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
+ListOfThirdParties=Lista de Terceiros
+ShowCompany=Mostrar terceiros
 ShowContact=Mostrar Contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
@@ -338,15 +338,15 @@ MyContacts=Os Meus Contactos
 Capital=Capital
 CapitalOf=Capital Social de %s
 EditCompany=Modificar Empresa
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Este usuário não é um possível cliente, cliente ou fornecedor
 VATIntraCheck=Verificar
-VATIntraCheckDesc=The link <b>%s</b> uses the European VAT checker service (VIES). An external internet access from server is required for this service to work.
+VATIntraCheckDesc=O link <b> %s </ b> utiliza o serviço europeu de verificação de IVA (VIES). É necessário um acesso externo à Internet do servidor para que este serviço funcione.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check intra-Community VAT on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraCheckableOnEUSite=Verificar o IVA intracomunitário no site da Comissão Europeia
+VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
-NorProspectNorCustomer=Not prospect, or customer
-JuridicalStatus=Legal Entity Type
+NorProspectNorCustomer=Não perspectiva, ou cliente
+JuridicalStatus=Tipo de Entidade Legal
 Staff=Empregados
 ProspectLevelShort=Cli. Potenc.
 ProspectLevel=Cliente Potencial
@@ -387,12 +387,12 @@ ExportCardToFormat=Exportar ficha para o formato
 ContactNotLinkedToCompany=Contacto não vinculado a um Terceiro
 DolibarrLogin=Dolibarr - Iniciar Sessão
 NoDolibarrAccess=Sem Acesso
-ExportDataset_company_1=Third Parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third Parties (companies/foundations/physical people) and their properties
-ImportDataset_company_2=Contacts/Addresses and attributes
-ImportDataset_company_3=Bank accounts of Third Parties
-ImportDataset_company_4=Third Parties - sales representatives (assign sales representatives/users to companies)
+ExportDataset_company_1=Terceiros (empresas / fundações / pessoas físicas) e suas propriedades
+ExportDataset_company_2=Contatos e suas propriedades
+ImportDataset_company_1=Terceiros (empresas / fundações / pessoas físicas) e suas propriedades
+ImportDataset_company_2=Contatos / Endereços e atributos
+ImportDataset_company_3=Contas bancárias de terceiros
+ImportDataset_company_4=Terceiros - representantes de vendas (atribua representantes de vendas / usuários a empresas)
 PriceLevel=Nível de preços
 DeliveryAddress=Direcção de Envío
 AddAddress=Adicionar Direcção
@@ -402,16 +402,16 @@ DeleteFile=Eliminar ficheiro
 ConfirmDeleteFile=Tem a certeza que quer eliminar este ficheiro?
 AllocateCommercial=Atribuído a representante de vendas
 Organization=Organismo
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Ano fiscal
 FiscalMonthStart=Mês de Inicio do Exercício
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustAssignUserMailFirst=Você deve criar um email para esse usuário antes de poder adicionar uma notificação por email.
 YouMustCreateContactFirst=Para adicionar a funcionalidade de notificações por e-mail, você deve definir contactos com e-mails válidos para o terceiro.
 ListSuppliersShort=Lista de Fornecedores
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Last %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+ListProspectsShort=Lista de Perspectivas
+ListCustomersShort=Lista de Clientes
+ThirdPartiesArea=Terceiros / Contatos
+LastModifiedThirdParties=Última %s modificado Terceiros
+UniqueThirdParties=Total de Terceiros
 InActivity=Aberto
 ActivityCeased=Fechado
 ThirdPartyIsClosed=O terceiro encontra-se fechado
@@ -420,15 +420,15 @@ CurrentOutstandingBill=Risco alcançado
 OutstandingBill=Montante máximo para faturas pendentes
 OutstandingBillReached=Montante máximo para faturas pendente foi alcançado
 OrderMinAmount=Quantidade mínima para encomenda
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Retorna um número com o formato %syymm-nnnn para o código do cliente e %syymm-nnnn para o código do fornecedor, onde yy é year, mm é month e nnnn é uma sequência sem quebra e sem retorno para 0.
 LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Terceiro duplicado (terceiro que deseja eliminar)
 MergeThirdparties=Gerir terceiros
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Tem certeza de que deseja mesclar esse terceiro no atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual e, em seguida, o terceiro será excluído.
 ThirdpartiesMergeSuccess=Os terceiros foram fundidos
 SaleRepresentativeLogin=Nome de utilizador do representante de vendas
 SaleRepresentativeFirstname=Primeiro nome do representante de vendas
 SaleRepresentativeLastname=Último nome do representante de vendas
 ErrorThirdpartiesMerge=Houve um erro ao eliminar os terceiros. Por favor, verifique o registo. As alterações foram revertidas.
-NewCustomerSupplierCodeProposed=Customer or vendor code already used, a new code is suggested
+NewCustomerSupplierCodeProposed=Código do cliente ou fornecedor já utilizado, um novo código é sugerido
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 15b70fc39e3..f770c0e4402 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -9,7 +9,7 @@ OptionModeTrueDesc=Neste método, o balanço calcula-se sobre a base das faturas
 OptionModeVirtualDesc=Neste contexto, o balanço é calculado sobre as faturas (data de validação). Quando essas faturas são devidas, tenham sido pagas ou não, elas serão listadas no resultado do balanço.
 FeatureIsSupportedInInOutModeOnly=Função disponível somente ao modo contas CREDITOS-dividas (Ver a configuração do módulo contas)
 VATReportBuildWithOptionDefinedInModule=Montantes apresentados aqui são calculadas usando as regras definidas pelo Imposto de configuração do módulo.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Os valores mostrados aqui são calculados usando regras definidas pela configuração da empresa.
 Param=Parametrização
 RemainingAmountPayment=Valor restante do pagamento:
 Account=Conta
@@ -19,12 +19,12 @@ Income=Depósitos
 Outcome=Despesas
 MenuReportInOut=Resultado / Exercício
 ReportInOut=Saldo de receitas e despesas
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportTurnover=Volume de negócios faturado
+ReportTurnoverCollected=Volume de negócios recolhido
 PaymentsNotLinkedToInvoice=Pagamentos não vinculados a qualquer fatura, portanto não vinculados a terceiros
 PaymentsNotLinkedToUser=Pagamentos não vinculados a um utilizador
 Profit=Beneficio
-AccountingResult=Accounting result
+AccountingResult=Resultado contabilístico
 BalanceBefore=Saldo (antes)
 Balance=Saldo
 Debit=Débito
@@ -35,163 +35,163 @@ AmountHTVATRealPaid=Total Pago
 VATToPay=Imposto a pagar
 VATReceived=Imposto recebido
 VATToCollect=Imposto a receber
-VATSummary=Tax monthly
+VATSummary=Imposto mensal
 VATBalance=Resumo do imposto
 VATPaid=Imposto pago
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
+LT1Summary=Resumo do Imposto 2
+LT2Summary=Resumo do imposto 3
 LT1SummaryES=RE Balance
 LT2SummaryES=Balanço IRPF
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
+LT1SummaryIN=Balanço CGST
+LT2SummaryIN=Balanço SGST
+LT1Paid=Imposto 2 pago
+LT2Paid=Imposto 3 pago
+LT1PaidES=RE pago
 LT2PaidES=IRPF Pago
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1PaidIN=CGST Pago
+LT2PaidIN=SGST Pago
+LT1Customer=Vendas de imposto 2
+LT1Supplier=Compras de impostos 2
+LT1CustomerES=Vendas RE
+LT1SupplierES=Compras RE
+LT1CustomerIN=Vendas CGST
+LT1SupplierIN=Compras CGST
+LT2Customer=Vendas de imposto 3
+LT2Supplier=Compras de imposto 3
 LT2CustomerES=Vendas IRPF
 LT2SupplierES=Compras IRPF
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=Vendas do SGST
+LT2SupplierIN=Compras do SGST
 VATCollected=IVA Recuperado
 ToPay=A pagar
 SpecialExpensesArea=Área para todos os pagamentos especiais
 SocialContribution=Imposto social ou fiscal
 SocialContributions=Impostos sociais ou fiscais
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-LabelContrib=Label contribution
-TypeContrib=Type contribution
+SocialContributionsDeductibles=Impostos sociais ou fiscais dedutíveis
+SocialContributionsNondeductibles=Impostos sociais ou fiscais não dedutíveis
+LabelContrib=Contribuição de etiqueta
+TypeContrib=Digite contribuição
 MenuSpecialExpenses=Despesas Especiais
 MenuTaxAndDividends=Impostos e Dividas
 MenuSocialContributions=Impostos sociais/fiscais
-MenuNewSocialContribution=Novo imposto
-NewSocialContribution=Novo imposto social/fiscal
-AddSocialContribution=Add social/fiscal tax
+MenuNewSocialContribution=Novo imposto fiscal/social
+NewSocialContribution=Novo imposto fiscal/social
+AddSocialContribution=Adicionar imposto social / fiscal
 ContributionsToPay=Impostos sociais/fiscais por pagar
-AccountancyTreasuryArea=Billing and payment area
+AccountancyTreasuryArea=Área de cobrança e pagamento
 NewPayment=Novo pagamento
 Payments=Pagamentos
 PaymentCustomerInvoice=Pagamento de fatura do cliente
-PaymentSupplierInvoice=Vendor invoice payment
+PaymentSupplierInvoice=Pagamento da fatura de fornecedor
 PaymentSocialContribution=Pagamento da taxa social/fiscal
 PaymentVat=Pagamento IVA
 ListPayment=Lista de pagamentos
 ListOfCustomerPayments=Lista de pagamentos de clientes
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
+ListOfSupplierPayments=Lista de pagamentos de fornecedores
+DateStartPeriod=Data de início do período
+DateEndPeriod=Período final de data
+newLT1Payment=Novo imposto 2 pagamento
+newLT2Payment=Novo pagamento de imposto 3
+LT1Payment=Pagamento do imposto 2
+LT1Payments=Pagamentos de imposto 2
+LT2Payment=Pagamento de imposto 3
+LT2Payments=Pagamentos de imposto 3
+newLT1PaymentES=Novo pagamento RE
 newLT2PaymentES=Nova pagamento IRPF
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=Pagamento RE
+LT1PaymentsES=Pagamentos RE
 LT2PaymentES=Pagamento IRPF
 LT2PaymentsES=Pagamentos IRPF
 VATPayment=Pagamento de imposto sobre vendas
 VATPayments=Pagamentos de impostos sobre vendas
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
+VATRefund=Reembolso de imposto sobre vendas
+NewVATPayment=Novo pagamento de impostos sobre vendas
+NewLocalTaxPayment=Novo imposto %s pagamento
+Refund=Reembolso
 SocialContributionsPayments=Pagamentos de impostos sociais/fiscais
 ShowVatPayment=Ver Pagamentos IVA
 TotalToPay=Total a Pagar
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nesta lista apenas se a tabela estiver classificada como ascendente no %s e filtrada para uma conta bancária
+CustomerAccountancyCode=Código de contabilidade do cliente
+SupplierAccountancyCode=Código de contabilidade do fornecedor
+CustomerAccountancyCodeShort=Cust. conta. código
+SupplierAccountancyCodeShort=Sup. conta. código
 AccountNumber=Número de conta
 NewAccountingAccount=Nova conta
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
+Turnover=Volume de negócios faturado
+TurnoverCollected=Volume de negócios recolhido
+SalesTurnoverMinimum=Volume de negócios mínimo
+ByExpenseIncome=Por despesas e rendas
 ByThirdParties=Por Terceiro
 ByUserAuthorOfInvoice=Por autor da fatura
 CheckReceipt=Ficha de cheques
 CheckReceiptShort=Ficha
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=Novo Cheque
-NewCheckDeposit=Novo Deposito
+LastCheckReceiptShort=Últimos recibos de cheques %s
+NewCheckReceipt=Novo desconto
+NewCheckDeposit=Novo depósito de cheque
 NewCheckDepositOn=Criar Novo deposito na conta: %s
 NoWaitingChecks=Nenhum cheque aguarda depósito.
 DateChequeReceived=Data da receção do cheque
-NbOfCheques=Nº de Cheques
+NbOfCheques=Nº de cheques
 PaySocialContribution=Pagar um imposto social/fiscal
 ConfirmPaySocialContribution=Tem certeza de que deseja classificar este imposto social ou fiscal como pago?
 DeleteSocialContribution=Eliminar um pagamento de imposto social ou fiscal
 ConfirmDeleteSocialContribution=Tem certeza de que deseja eliminar este pagamento de imposto social/fiscal?
 ExportDataset_tax_1=Impostos e pagamentos sociais e fiscais
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of <b>data journalized in Bookkeeping Ledger table</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeVATDebt=Modo <b> %sVAT no compromisso accounting%s </ b>.
+CalcModeVATEngagement=Modo <b> %sVAT em rendimentos-expenses%s </ b>.
+CalcModeDebt=Análise de faturas registradas, mesmo que ainda não estejam contabilizadas no razão.
+CalcModeEngagement=Análise de pagamentos registrados conhecidos, mesmo que eles ainda não sejam contabilizados no Ledger.
+CalcModeBookkeeping=Análise de dados com periodicidade na tabela Ledger de contabilidade.
+CalcModeLT1= Modo <b> %sRE nas faturas do cliente - fornecedores invoices%s </ b>
+CalcModeLT1Debt=Modo <b> %sRE no cliente invoices%s </ b>
+CalcModeLT1Rec= Modo <b> %sRE em fornecedores invoices%s </ b>
+CalcModeLT2= Modo <b> %sIRPF em faturas de clientes - fornecedores invoices%s </ b>
+CalcModeLT2Debt=Modo <b> %sIRPF no cliente invoices%s </ b>
+CalcModeLT2Rec= Modo <b> %sIRPF em fornecedores invoices%s </ b>
 AnnualSummaryDueDebtMode=Balanço da receita e despesas, resumo anual
 AnnualSummaryInputOutputMode=Balanço da receita e despesas, resumo anual
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+AnnualByCompanies=Saldo de receitas e despesas, por grupos predefinidos de conta
+AnnualByCompaniesDueDebtMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sClaims-Debts%s </ b> disse <b> Contabilidade de compromisso </ b>.
+AnnualByCompaniesInputOutputMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sIncomes-Expenses%s </ b> disse <b> contabilidade de caixa </ b>.
+SeeReportInInputOutputMode=Consulte %sanálise de payments%s para um cálculo de pagamentos reais efetuados, mesmo que eles ainda não tenham sido contabilizados no Ledger.
+SeeReportInDueDebtMode=Consulte %sanálise de invoices%s para um cálculo baseado em faturas registradas conhecidas, mesmo que elas ainda não tenham sido contabilizadas no Ledger.
+SeeReportInBookkeepingMode=Consulte <b> %sRelatório de reservas%s </ b> para um cálculo na <b> tabela Razão da contabilidade </ b>
 RulesAmountWithTaxIncluded=- Os montantes exibidos contêm todas as taxas incluídas
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
+RulesResultDue=- Inclui faturas pendentes, despesas, IVA, doações, sejam elas pagas ou não. Inclui também salários pagos. <br> - Baseia-se na data de validação das faturas e do IVA e na data de vencimento das despesas. Para os salários definidos com o módulo Salário, a data-valor do pagamento é utilizada.
+RulesResultInOut=- Inclui os pagamentos reais feitos em faturas, despesas, IVA e salários. <br> - Baseia-se nas datas de pagamento das faturas, despesas, IVA e salários. A data de doação para doação.
+RulesCADue=- Inclui as faturas devidas do cliente, sejam elas pagas ou não. <br> - É baseado na data de validação dessas faturas. <br>
 RulesCAIn=- Inclui os pagamentos efetuados das faturas a clientes.<br>- Se baseia na data de pagamento das mesmas<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
+RulesCATotalSaleJournal=Inclui todas as linhas de crédito do diário de venda.
+RulesAmountOnInOutBookkeepingRecord=Inclui registro em seu livro contábil com contas contábeis que tem o grupo "DESPESA" ou "LUCRO"
+RulesResultBookkeepingPredefined=Inclui registro em seu livro contábil com contas contábeis que tem o grupo "DESPESA" ou "LUCRO"
+RulesResultBookkeepingPersonalized=Ele mostra um registro em seu livro contábil com contas contábeis <b> agrupadas por grupos personalizados </ b>
+SeePageForSetup=Veja o menu <a href="%s"> %s </a> para configuração
 DepositsAreNotIncluded=- As faturas de adiantamento não estão incluídas
 DepositsAreIncluded=- As faturas de adiantamento estão incluídas
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=Report by third party RE
+LT1ReportByCustomers=Denunciar imposto 2 por terceiros
+LT2ReportByCustomers=Denunciar imposto 3 por terceiros
+LT1ReportByCustomersES=Relatório de terceiros RE
 LT2ReportByCustomersES=Relatório de terceiros IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
-LT1ReportByQuartersES=Report by RE rate
-LT2ReportByQuartersES=Report by IRPF rate
+VATReport=Relatório fiscal de venda
+VATReportByPeriods=Relatório fiscal de vendas por período
+VATReportByRates=Relatório fiscal de venda por taxas
+VATReportByThirdParties=Relatório fiscal de vendas de terceiros
+VATReportByCustomers=Relatório fiscal de venda por cliente
+VATReportByCustomersInInputOutputMode=Relatório do IVA do cliente recolhido e pago
+VATReportByQuartersInInputOutputMode=Relatório por taxa de imposto de venda do imposto cobrado e pago
+LT1ReportByQuarters=Relate imposto 2 pela taxa
+LT2ReportByQuarters=Relate imposto 3 pela taxa
+LT1ReportByQuartersES=Relatório por taxa de retorno
+LT2ReportByQuartersES=Relatório por taxa de IRPF
 SeeVATReportInInputOutputMode=Ver o Relatório <b>%sIVA pago%s</b> para um modo de cálculo Standard
 SeeVATReportInDueDebtMode=Ver o Relatório <b>%sIVA devido%s</b> para um modo de cálculo com a Opção sobre o devido
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- Para serviços, o relatório inclui os regulamentos do IVA efetivamente recebidos ou emitidos com base na data do pagamento.
 RulesVATInProducts=Para os ativos materiais, o relatório inclui o IVA recebido ou emitido com base na data do pagamento.
 RulesVATDueServices=- Para os serviços, o relatório inclui faturas de IVA devido, pago ou não, com base na data da fatura.
 RulesVATDueProducts=- Para os ativos materiais, o relatório inclui as faturas de IVA, com base na data da fatura.
 OptionVatInfoModuleComptabilite=Nota: para os ativos materiais, seria necessário utilizar a data de entrega para ser mais justo.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+ThisIsAnEstimatedValue=Essa é uma visualização com base em eventos de negócios e não na tabela de razão final, portanto, os resultados finais podem diferir desses valores de visualização
 PercentOfInvoice=%%/fatura
 NotUsedForGoods=Não utilizados em bens
 ProposalStats=Estatísticas sobre os orçamentos
@@ -208,52 +208,52 @@ DescPurchasesJournal=Relatório compras
 InvoiceRef=Ref fatura.
 CodeNotDef=Não definido
 WarningDepositsNotIncluded=As faturas de adiantamento não estão incluídas nesta versão com este módulo de contabilidade.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+DatePaymentTermCantBeLowerThanObjectDate=A data do termo de pagamento não pode ser inferior à data do objeto.
 Pcg_version=Modelos de planos de contas
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By product and service
+Pcg_type=Tipo Pcg
+Pcg_subtype=Subtipo de PCG
+InvoiceLinesToDispatch=Linhas de fatura para despacho
+ByProductsAndServices=Por produto e serviço
 RefExt=Ref externa
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=Para criar uma fatura modelo, crie uma fatura padrão e, sem validá-la, clique no botão "%s".
 LinkedOrder=Associar a encomenda
 Mode1=Método 1
 Mode2=Método 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationRuleDesc=Para calcular o IVA total, existem dois métodos: <br> O método 1 é o arredondamento do IVA em cada linha, depois a soma dos mesmos. <br> O método 2 pode somar todos os IVAs em cada linha e depois o resultado do arredondamento. de alguns centavos. O modo padrão é o modo <b> %s </ b>.
+CalculationRuleDescSupplier=De acordo com o fornecedor, escolha o método apropriado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado pelo seu fornecedor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=O relatório do volume de negócios recolhido por produto não está disponível. Este relatório está disponível apenas para faturamento faturado.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=O relatório do volume de negócios cobrado por taxa de imposto sobre vendas não está disponível. Este relatório está disponível apenas para faturamento faturado.
 CalculationMode=Modo de cálculo
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
-CloneTax=Clone a social/fiscal tax
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
+AccountancyJournal=Diário de códigos contábeis
+ACCOUNTING_VAT_SOLD_ACCOUNT=Conta de contabilidade por padrão para IVA sobre vendas (usada se não definida na configuração do dicionário de IVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Conta de contabilidade por padrão para IVA nas compras (usada se não definida na configuração do dicionário de IVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Conta de contabilidade por padrão para pagar o IVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Conta de contabilidade usada para terceiros do cliente
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada apenas para a contabilidade da Subledger. Este será usado para Contabilidade Geral e como valor padrão da contabilidade do Contador, se a conta contábil do cliente dedicada a terceiros não estiver definida.
+ACCOUNTING_ACCOUNT_SUPPLIER=Conta de contabilidade usada para fornecedores de terceiros
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada apenas para a contabilidade da Subledger. Este será usado para Contabilidade Geral e como valor padrão da contabilidade do Contador, se a conta de contabilidade de fornecedor dedicada a terceiros não estiver definida.
+CloneTax=Clone um imposto social / fiscal
+ConfirmCloneTax=Confirme o clone de um imposto social / fiscal
 CloneTaxForNextMonth=Cloná-la para o mês seguinte
 SimpleReport=Relatório simples
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
+AddExtraReport=Relatórios extras (adicionar relatório de cliente estrangeiro e nacional)
+OtherCountriesCustomersReport=Relatório de clientes estrangeiros
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Com base nas duas primeiras letras do número de IVA diferente do código de país da sua empresa
+SameCountryCustomersWithVAT=Relatório de clientes nacionais
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Com base nas duas primeiras letras do número de IVA que é o mesmo que o código de país da sua empresa
+LinkedFichinter=Link para uma intervenção
 ImportDataset_tax_contrib=Impostos sociais/fiscais
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+ImportDataset_tax_vat=Pagamentos de IVA
+ErrorBankAccountNotFound=Erro: conta bancária não encontrada
 FiscalPeriod=Período de contabilidade
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignement
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
+ListSocialContributionAssociatedProject=Lista de contribuições sociais associadas ao projeto
+DeleteFromCat=Remover do grupo de contabilidade
+AccountingAffectation=Atribuição contábil
+LastDayTaxIsRelatedTo=Último dia do período em que o imposto está relacionado
+VATDue=Imposto de venda reivindicado
+ClaimedForThisPeriod=Reivindicado pelo período
+PaidDuringThisPeriod=Pago durante este período
+ByVatRate=Por taxa de imposto de venda
+TurnoverbyVatrate=Volume de negócios faturado por taxa de imposto sobre vendas
+TurnoverCollectedbyVatrate=Volume de negócios cobrado pela taxa de imposto sobre vendas
+PurchasebyVatrate=Compra por taxa de imposto sobre vendas
diff --git a/htdocs/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang
index 546e2a129df..e56556bf717 100644
--- a/htdocs/langs/pt_PT/dict.lang
+++ b/htdocs/langs/pt_PT/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Ilha Heard e McDonald
 CountryVA=Santa Sé (Vaticano)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Índia
 CountryID=Indonésia
 CountryIR=Irão
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Coreia do Norte
 CountryKR=Coréia do Sul
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Laociano
 CountryLV=Letônia
 CountryLB=Líbano
@@ -160,7 +160,7 @@ CountryMD=Moldávia
 CountryMN=Mongólia
 CountryMS=Montserrat
 CountryMZ=Moçambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namíbia
 CountryNR=Nauruano
 CountryNP=Nepal
@@ -179,7 +179,7 @@ CountryPK=Paquistão
 CountryPW=Palau
 CountryPS=Território Palestiniano, Ocupado
 CountryPA=Panamá
-CountryPG=Papuásia-Nova Guiné
+CountryPG=Papua-Nova Guiné
 CountryPY=Paraguai
 CountryPE=Peru
 CountryPH=Filipinas
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad e Tobago
 CountryTR=Turquia
 CountryTM=Turquemenistão
-CountryTC=Ilhas Turcas e Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvaluano
 CountryUG=Uganda
 CountryUA=Ucrania
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Maurício rupias
 CurrencySingMUR=Rupee Maurícia
 CurrencyNOK=Krones norueguês
-CurrencySingNOK=Coroa Norueguesa
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=TND
 CurrencySingTND=Dinar tunisino
 CurrencyUSD=Dólar E.U.
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Palavra de boca
 DemandReasonTypeSRC_PARTNER=Parceiro
 DemandReasonTypeSRC_EMPLOYEE=Empregado
 DemandReasonTypeSRC_SPONSORING=Patrocínio
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formato 4A0
 PaperFormatEU2A0=Formato 2A0
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 61dd3535555..892c93c2acd 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=N.º de documentos na diretoria
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Diretoria
 ECMSectionManual=Diretoria manual
 ECMSectionAuto=Pasta automática
@@ -7,7 +7,7 @@ ECMSectionsManual=Pastas manuais
 ECMSectionsAuto=Pastas automáticas
 ECMSections=Pastas
 ECMRoot=Raiz do GCE
-ECMNewSection=Nova pasta manual
+ECMNewSection=Nova diretoria
 ECMAddSection=Adicionar pasta manual
 ECMCreationDate=Data de criação
 ECMNbOfFilesInDir=Número de ficheiros na pasta
@@ -25,7 +25,7 @@ ECMSectionOfDocuments=Pastas de documentos
 ECMTypeAuto=Automático
 ECMDocsBySocialContributions=Documentos associados com os impostos fiscais ou sociais
 ECMDocsByThirdParties=Documentos associados a terceiros
-ECMDocsByProposals=Documentos associcados a orçamentos
+ECMDocsByProposals=Documentos associados aos orçamentos
 ECMDocsByOrders=Documentos associados a pedidos
 ECMDocsByContracts=Documentos associados a contratos
 ECMDocsByInvoices=Documentos associados a faturas
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documentos associados a projectos
 ECMDocsByUsers=Documentos associados a utilizadores
 ECMDocsByInterventions=Documentos associados a intervenções
 ECMDocsByExpenseReports=Documentos associados a relatórios de despesas
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nenhuma pasta criada
 ShowECMSection=Mostrar Pasta
 DeleteSection=Remover diretório
@@ -46,6 +48,5 @@ ECMSelectASection=Selecione uma pasta na árvore...
 DirNotSynchronizedSyncFirst=Este diretório parece ter sido ser criado ou modificado fora do módulo GCE. Você deve clicar no botão "Voltar a sincronizar" primeiro para sincronizar o disco e a base de dados para obter o conteúdo desse diretório.
 ReSyncListOfDir=Voltar a sincronizar a lista de diretórios
 HashOfFileContent=Hash do conteúdo do ficheiro
-FileNotYetIndexedInDatabase=Ficheiro ainda não indexado na base de dados (tente voltar a carregá-lo)
-FileSharedViaALink=Ficheiro partilhado via link
 NoDirectoriesFound=Nenhum diretório encontrado
+FileNotYetIndexedInDatabase=Ficheiro ainda não indexado na base de dados (tente voltar a carregá-lo)
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index d7d5889b447..100ec23e020 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -6,7 +6,7 @@ NoErrorCommitIsDone=Nenhum erro
 ErrorButCommitIsDone=Erros encontrados, mas a validação foi efetuada apesar disso
 ErrorBadEMail=O email %s está errado
 ErrorBadUrl=O url %s está errado
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro. Acrescenta geralmente quando falta a tradução.
 ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
 ErrorRecordNotFound=Registo não foi encontrado.
@@ -18,33 +18,33 @@ ErrorFailToCreateFile=Ocorreu um erro ao criar o ficheiro '<b>%s</b>'.
 ErrorFailToRenameDir=Ocorreu um erro ao mudar o nome da pasta '<b>%s</b>' para '<b>%s</b>'.
 ErrorFailToCreateDir=Ocorreu um erro ao criar a pasta '<b>%s</b>'
 ErrorFailToDeleteDir=Ocorreu um erro ao eliminar a pasta '<b>%s</b>'.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Falha ao fazer a substituição no arquivo '<b> %s </ b>'.
+ErrorFailToGenerateFile=Falha ao gerar o arquivo '<b> %s </ b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto já está definido como contacto para este tipo.
 ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo Caixa e só aceita o método de pagamento de tipo <b>especie</b>.
 ErrorFromToAccountsMustDiffers=A conta origem e destino devem ser diferentes.
 ErrorBadThirdPartyName=Nome de Terceiro incorrecto
 ErrorProdIdIsMandatory=O %s é obrigatório
 ErrorBadCustomerCodeSyntax=A sintaxis do código cliente é incorrecta
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Má sintaxe para código de barras. Pode ser que você defina um tipo de código de barras incorreto ou tenha definido uma máscara de código de barras para numeração que não corresponda ao valor verificado.
 ErrorCustomerCodeRequired=Código cliente obrigatório
 ErrorBarCodeRequired=Código de barras obrigatório
 ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado
 ErrorBarCodeAlreadyUsed=Código de barras em utilização
 ErrorPrefixRequired=Prefixo obrigatório
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorBadSupplierCodeSyntax=Má sintaxe para o código do fornecedor
 ErrorSupplierCodeRequired=Obrigatório código de fornecedor
 ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado
 ErrorBadParameters=Parâmetros incorrectos
 ErrorBadValueForParameter=Valor errado '%s' para o parâmetro '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadImageFormat=O arquivo de imagem não tem um formato suportado (seu PHP não suporta funções para converter imagens desse formato)
 ErrorBadDateFormat=&quot;%s&quot; Valor tem formato de data errado
 ErrorWrongDate=A data não está correcta!
 ErrorFailedToWriteInDir=Impossivel escrever na pasta %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorrecta em email em %s linhas em Ficheiro (Exemplo linha %s com email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=O usuário não pode ser excluído. Talvez esteja associado a entidades do Dolibarr.
 ErrorFieldsRequired=Não se indicaram alguns campos obrigatórios
-ErrorSubjectIsRequired=The email topic is required
+ErrorSubjectIsRequired=O tópico do email é obrigatório
 ErrorFailedToCreateDir=Erro na criação de uma pasta. Verifique se o usuário do servidor Web tem acesso de escrita aos documentos Dolibarr. Se o parâmetro <b> safe_mode </ b> está ativo no PHP, Verifique se os arquivos php do Dolibarr são da propriedade do usuário do servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail não definido para este utilizador
 ErrorFeatureNeedJavascript=Esta Funcionalidade precisa de javascript activo para funcionar. Modifique em configuração->ambiente.
@@ -64,23 +64,23 @@ ErrorSizeTooLongForVarcharType=Tamanho demasiado longo para o tipo string (%s m
 ErrorNoValueForSelectType=Por favor, preencha o valor para lista de selecção
 ErrorNoValueForCheckBoxType=Preencha o valor da lista da caixa de seleção
 ErrorNoValueForRadioType=Por favor, preencha o valor da lista
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorBadFormatValueList=O valor da lista não pode ter mais de uma vírgula: <u> %s </ u>, mas precisa de pelo menos um: key, value
+ErrorFieldCanNotContainSpecialCharacters=O campo <b> %s </ b> não deve conter caracteres especiais.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=O campo <b> %s </ b> não deve conter caracteres especiais nem caracteres maiúsculos e não pode conter apenas números.
+ErrorFieldMustHaveXChar=O campo <b> %s </ b> deve ter pelo menos %s caracteres.
 ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não activado
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Este nome de perfil já existe para este conjunto de exportação.
 ErrorLDAPSetupNotComplete=A configuração Dolibarr-LDAP é incompleta.
 ErrorLDAPMakeManualTest=Foi criado um Ficheiro .ldif na pasta %s. Trate de gerir manualmente este Ficheiro desde a linha de comandos para Obter mais detalhes acerca do erro.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorCantSaveADoneUserWithZeroPercentage=Não é possível salvar uma ação com "status não iniciado" se o campo "concluído por" também estiver preenchido.
 ErrorRefAlreadyExists=A referencia utilizada para a criação já existe
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorPleaseTypeBankTransactionReportName=Por favor, insira o nome do extrato bancário onde a entrada deve ser relatada (Formato AAAA ou AAAAMMDD)
+ErrorRecordHasChildren=Falha ao excluir registro, pois possui alguns registros filhos.
 ErrorRecordHasAtLeastOneChildOfType=O objeto tem pelo menos um elemento do tipo %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorRecordIsUsedCantDelete=Não é possível excluir o registro. Já é usado ou incluído em outro objeto.
 ErrorModuleRequireJavascript=Javascript não deve estar desativado para que esta funcionalidade funcione. Para ativar/desativar o JavaScript, vá para o menu Início->Configuração->Exibir.
 ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorContactEMail=Ocorreu um erro técnico. Por favor, entre em contato com o administrador para o seguinte e-mail <b> %s </ b> e forneça o código de erro <b> %s </ b> em sua mensagem ou adicione uma cópia da tela desta página.
 ErrorWrongValueForField=Valor errado para o número <b>%s</b> campo (valor <b>&quot;%s&quot;</b> não coincide com <b>%s</b> regra regex)
 ErrorFieldValueNotIn=Valor errado para <b>%s</b> campo de número <b>(&quot;%s&quot;</b> de valor não é um valor disponível em <b>%s %s</b> campo de tabela)
 ErrorFieldRefNotIn=Valor errado para <b>%s</b> número de campo <b>(&quot;%s&quot;</b> valor não é um ref <b>%s</b> existente)
@@ -88,25 +88,25 @@ ErrorsOnXLines=<b>%s</b> sobre as linhas das fontes de erros
 ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus)
 ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo &quot;%s&quot;
 ErrorNumRefModel=Existe uma referência em banco de dados (%s) e não é compatível com esta regra de numeração. Remover registro ou renomeado de referência para ativar este módulo.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created beacuse of too low quantity
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorQtyTooLowForThisSupplier=Quantidade muito baixa para este fornecedor ou nenhum preço definido neste produto para este fornecedor
+ErrorOrdersNotCreatedQtyTooLow=Algumas ordens não foram criadas por causa da quantidade muito baixa
+ErrorModuleSetupNotComplete=A configuração do módulo parece incompleta. Vá em Home - Setup - Módulos para completar.
 ErrorBadMask=Erro na máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Máscara de erro, sem número de seqüência
 ErrorBadMaskBadRazMonth=Erro, o valor de reset ruim
-ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorMaxNumberReachForThisMask=Alcance máximo de números para esta máscara
+ErrorCounterMustHaveMoreThan3Digits=O contador deve ter mais de 3 dígitos
 ErrorSelectAtLeastOne=Erro. Selecione pelo menos uma entrada.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorDeleteNotPossibleLineIsConsolidated=Excluir não é possível porque o registro está vinculado a uma transação bancária conciliada
 ErrorProdIdAlreadyExist=%s é atribuído a um terço
 ErrorFailedToSendPassword=Erro ao enviar a palavra-passe
 ErrorFailedToLoadRSSFile=Falha ao obter feed RSS. Tente adicionar MAIN_SIMPLEXMLLOAD_DEBUG constante se as mensagens de erro não fornecer informações suficientes.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Acesso negado. <br> Você tenta acessar uma página, área ou recurso de um módulo desativado ou sem estar em uma sessão autenticada ou que não é permitido ao usuário.
 ErrorForbidden2=Os permissões para este utilizador podem ser asignados pelo o administrador Dolibarr mediante o menu %s-> %s.
 ErrorForbidden3=Dolibarr não parece funcionar numa Sessão autentificada. Consulte a documentação de Instalação de Dolibarr para saber como administrar as autenticações (htaccess, mod_auth u outro...).
 ErrorNoImagickReadimage=A função imagick_readimage não está presente nesta Instalação de PHP. a revisão não está pois disponivel. Os administradores podem desactivar este separador no menu configuração - visualização.
 ErrorRecordAlreadyExists=Registo já existente
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Esta etiqueta já existe
 ErrorCantReadFile=Erro na leitura do ficheiro '&s'
 ErrorCantReadDir=Erro na leitura da pasta '%s'
 ErrorBadLoginPassword=Utilizador ou palavra-passe incorretos
@@ -117,121 +117,121 @@ ErrorLoginDoesNotExists=a conta de utilizador de <b>%s</b> não foi encontrado.
 ErrorLoginHasNoEmail=Este utilizador não tem e-mail. impossivel continuar.
 ErrorBadValueForCode=Valor incorreto para o código de segurança. Tente novamente com um novo valor...
 ErrorBothFieldCantBeNegative=Campos %s %s e não pode ser tanto negativo
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> can't be negative on such type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to restore old behaviour.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorFieldCantBeNegativeOnInvoice=O campo <strong> %s </ strong> não pode ser negativo nesse tipo de fatura. Se você quiser adicionar uma linha de desconto, basta criar o desconto primeiro com o link %s na tela e aplicá-lo à fatura. Você também pode pedir ao seu administrador para definir a opção FACTURE_ENABLE_NEGATIVE_LINES como 1 para restaurar o comportamento antigo.
+ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade de linha nas faturas do cliente não pode ser negativa
 ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar <b>%s</b> servidor web não tem permissão para que
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
 ErrUnzipFails=Falha ao extrair %s com o ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrNoZipEngine=Nenhum mecanismo para compactar / descompactar o arquivo %s neste PHP
 ErrorFileMustBeADolibarrPackage=O ficheiro %s deve ser um pacote Dolibarr no formato zip
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Você deve selecionar um arquivo de pacote do módulo Dolibarr
 ErrorPhpCurlNotInstalled=O PHP CURL não está instalado, isto é essencial para comunicar com o Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorFailedToAddToMailmanList=Falha ao adicionar o registro %s à lista Mailman %s ou base SPIP
+ErrorFailedToRemoveToMailmanList=Falha ao remover o registro %s para a lista do Mailman %s ou base do SPIP
 ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao antigo
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToValidatePasswordReset=Não foi possível reinicializar a senha. Pode ser que a reinicialização já tenha sido feita (esse link pode ser usado apenas uma vez). Caso contrário, tente reiniciar o processo de reinicialização.
+ErrorToConnectToMysqlCheckInstance=Conectar-se ao banco de dados falha. Verifique se o servidor de banco de dados está em execução (por exemplo, com mysql / mariadb, você pode iniciá-lo a partir da linha de comando com 'sudo service mysql start').
 ErrorFailedToAddContact=Falha ao adicionar contato
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorDateMustBeBeforeToday=A data não pode ser maior que hoje
+ErrorPaymentModeDefinedToWithoutSetup=Um modo de pagamento foi definido para digitar %s, mas a configuração do módulo Fatura não foi concluída para definir informações a serem exibidas para esse modo de pagamento.
 ErrorPHPNeedModule=Erro, o php deve ter o módulo <b>%s</b> instalado para utilizar esta funcionalidade
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorOpenIDSetupNotComplete=Você configura o arquivo de configuração Dolibarr para permitir a autenticação OpenID, mas o URL do serviço OpenID não está definido em %s constante
 ErrorWarehouseMustDiffers=Os armazéns de origem e de destino não devem ser iguais
 ErrorBadFormat=Formato incorrecto!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, este membro ainda não está vinculado a terceiros. Vincule o membro a um terceiro existente ou crie um novo terceiro antes de criar uma assinatura com fatura.
+ErrorThereIsSomeDeliveries=Erro, há algumas entregas vinculadas a essa remessa. Exclusão recusada.
+ErrorCantDeletePaymentReconciliated=Não é possível excluir um pagamento que gerou uma entrada bancária reconciliada
+ErrorCantDeletePaymentSharedWithPayedInvoice=Não é possível excluir um pagamento compartilhado por pelo menos uma fatura com status Pago
+ErrorPriceExpression1=Não é possível atribuir a constante '%s'
+ErrorPriceExpression2=Não é possível redefinir a função incorporada '%s'
+ErrorPriceExpression3=Variável indefinida '%s' na definição da função
+ErrorPriceExpression4=Caráter ilegal '%s'
+ErrorPriceExpression5=Inesperado '%s'
+ErrorPriceExpression6=Número incorreto de argumentos (%s dado, %s esperado)
+ErrorPriceExpression8=Operador inesperado '%s'
+ErrorPriceExpression9=Ocorreu um erro inesperado
+ErrorPriceExpression10=Operador '%s' não tem operando
+ErrorPriceExpression11=Esperando '%s'
+ErrorPriceExpression14=Divisão por zero
+ErrorPriceExpression17=Variável indefinida '%s'
+ErrorPriceExpression19=Expressão não encontrada
+ErrorPriceExpression20=Expressão vazia
+ErrorPriceExpression21=Resultado vazio '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorPriceExpression23=Variável desconhecida ou não definida '%s' em %s
+ErrorPriceExpression24=Variável '%s' existe mas não tem valor
+ErrorPriceExpressionInternal=Erro interno '%s'
+ErrorPriceExpressionUnknown=Erro desconhecido '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Os armazéns de origem e de destino não devem ser iguais
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorTryToMakeMoveOnProductRequiringBatchData=Erro ao tentar fazer um movimento de estoque sem informações de lote / serial, no produto '%s' que requer informações de lote / serial
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas as recepções registradas devem primeiro ser verificadas (aprovadas ou negadas) antes de serem autorizadas a fazer esta ação
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas as recepções registradas devem primeiro ser verificadas (aprovadas) antes de serem autorizadas a executar esta ação
+ErrorGlobalVariableUpdater0=Pedido HTTP falhou com o erro "%s"
+ErrorGlobalVariableUpdater1=Formato JSON inválido '%s'
+ErrorGlobalVariableUpdater2=Parâmetro ausente '%s'
+ErrorGlobalVariableUpdater3=Os dados solicitados não foram encontrados no resultado
+ErrorGlobalVariableUpdater4=Cliente SOAP falhou com o erro '%s'
+ErrorGlobalVariableUpdater5=Nenhuma variável global selecionada
+ErrorFieldMustBeANumeric=O campo <b> %s </ b> deve ser um valor numérico
+ErrorMandatoryParametersNotProvided=Parâmetro (s) obrigatório (s) não fornecido (s)
+ErrorOppStatusRequiredIfAmount=Você define um valor estimado para esse lead. Então você também deve inserir seu status
+ErrorFailedToLoadModuleDescriptorForXXX=Falha ao carregar a classe do descritor de módulo para %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array No Descriptor do Módulo (valor incorreto para a tecla fk_menu)
+ErrorSavingChanges=Ocorreu um erro ao salvar as alterações
+ErrorWarehouseRequiredIntoShipmentLine=Armazém é necessário na linha para enviar
+ErrorFileMustHaveFormat=O arquivo deve ter o formato %s
 ErrorSupplierCountryIsNotDefined=O país para este fornecedor não está definido. Corrija isto primeiro.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorsThirdpartyMerge=Falha ao mesclar os dois registros. Pedido cancelado.
+ErrorStockIsNotEnoughToAddProductOnOrder=Estoque não é suficiente para o produto %s adicioná-lo em um novo pedido.
+ErrorStockIsNotEnoughToAddProductOnInvoice=O estoque não é suficiente para o produto %s adicioná-lo em uma nova fatura.
+ErrorStockIsNotEnoughToAddProductOnShipment=Estoque não é suficiente para o produto %s adicioná-lo em uma nova remessa.
+ErrorStockIsNotEnoughToAddProductOnProposal=Estoque não é suficiente para o produto %s adicioná-lo em uma nova proposta.
+ErrorFailedToLoadLoginFileForMode=Falha ao obter a chave de login para o modo '%s'.
+ErrorModuleNotFound=Arquivo do módulo não foi encontrado.
+ErrorFieldAccountNotDefinedForBankLine=Valor para a conta Contabilidade não definida para o ID da linha de origem %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Valor para a conta Contabilidade não definida para o ID da fatura %s (%s)
+ErrorFieldAccountNotDefinedForLine=Valor da conta Contabilidade não definido para a linha (%s)
+ErrorBankStatementNameMustFollowRegex=Erro, o nome do extrato bancário deve seguir a seguinte regra de sintaxe %s
+ErrorPhpMailDelivery=Verifique se você não usa um número muito alto de destinatários e se seu conteúdo de e-mail não é semelhante a um spam. Peça também ao administrador para verificar os arquivos de logs do firewall e do servidor para obter informações mais completas.
+ErrorUserNotAssignedToTask=O usuário deve ser atribuído à tarefa para poder inserir o tempo consumido.
+ErrorTaskAlreadyAssigned=Tarefa já atribuída ao usuário
+ErrorModuleFileSeemsToHaveAWrongFormat=O pacote de módulos parece ter um formato incorreto.
+ErrorFilenameDosNotMatchDolibarrPackageRules=O nome do pacote do módulo (<strong> %s </ strong>) não corresponde à sintaxe de nome esperada: <strong> %s </ strong>
+ErrorDuplicateTrigger=Erro, nome de disparo duplicado %s. Já carregado de %s.
+ErrorNoWarehouseDefined=Erro, nenhum armazém definido.
+ErrorBadLinkSourceSetButBadValueForRef=O link que você usa não é válido. Uma 'fonte' para pagamento é definida, mas o valor para 'ref' não é válido.
+ErrorTooManyErrorsProcessStopped=Muitos erros. Processo foi parado.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=A validação em massa não é possível quando a opção para aumentar / diminuir estoque é definida nesta ação (você deve validar um por um para definir o depósito para aumentar / diminuir)
 ErrorObjectMustHaveStatusDraftToBeValidated=O objeto %s deve estar no estado 'Rascunho' para ser validado.
 ErrorObjectMustHaveLinesToBeValidated=O objeto %s deve ter linhas para ser validado.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Somente faturas validadas podem ser enviadas usando a ação em massa "Enviar por e-mail".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Você deve escolher se o artigo é um produto pré-definido ou não
+ErrorDiscountLargerThanRemainToPaySplitItBefore=O desconto que você tenta aplicar é maior do que continuar a pagar. Divida o desconto em 2 descontos menores antes.
 ErrorFileNotFoundWithSharedLink=Ficheiro não encontrado. É possível que a chave de partilha tenha sido modificada ou o ficheiro tenha sido removido recentemente.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorProductBarCodeAlreadyExists=O código de barras do produto %s já existe em outra referência de produto.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observe também que não é possível usar o produto virtual para aumentar / diminuir automaticamente subprodutos quando pelo menos um subproduto (ou subproduto de subprodutos) precisa de um número de série / lote.
+ErrorDescRequiredForFreeProductLines=A descrição é obrigatória para linhas com produto livre
+ErrorAPageWithThisNameOrAliasAlreadyExists=A página / container <strong> %s </ strong> tem o mesmo nome ou alias alternativo que você usa
+ErrorDuringChartLoad=Erro ao carregar o gráfico de conta. Se algumas contas não foram carregadas, você ainda pode inseri-las manualmente.
 # Warnings
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
 WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
 WarningSafeModeOnCheckExecDir=Atenção, PHP <b>safe_mode</b> opção está no modo de comando devem ser armazenados dentro de um diretório declarado pelo <b>safe_mode_exec_dir</b> parâmetro php.
 WarningBookmarkAlreadyExists=Já existe um marcador com este título o esta URL.
 WarningPassIsEmpty=Atenção:A palavra-passe da base de dados está vazia. ISto é um buraco na segurança. deve agregar uma palavra-passe á sua base de dados e alterar o seu Ficheiro conf.php para reflectir isto.
 WarningConfFileMustBeReadOnly=Atenção, seu arquivo de configuração <b>(htdocs / conf / conf.php)</b> pode ser substituído pelo servidor web. Esta é uma falha de segurança grave. Modificar permissões no arquivo a ser em modo de leitura apenas para usuário do sistema operacional usado pelo servidor web. Se você usa Windows e no formato FAT para o seu disco, você deve saber que este sistema de arquivos não permite adicionar permissões em arquivo, por isso não pode ser completamente seguro.
 WarningsOnXLines=<b>%s</b> em linhas de código Avisos
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningNoDocumentModelActivated=Nenhum modelo, para geração de documentos, foi ativado. Um modelo será escolhido por padrão até você verificar a configuração do seu módulo.
+WarningLockFileDoesNotExists=Atenção, assim que a configuração estiver concluída, você deve desativar as ferramentas de instalação / migração, adicionando um arquivo <b> install.lock </ b> no diretório <b> %s </ b>. Falta este arquivo é uma falha de segurança.
+WarningUntilDirRemoved=Todos os avisos de segurança (visíveis apenas por usuários administradores) permanecerão ativos enquanto a vulnerabilidade estiver presente (ou que a constante MAIN_REMOVE_INSTALL_WARNING seja adicionada em Configuração-> Outras Configurações).
+WarningCloseAlways=Aviso, o fechamento é feito mesmo que a quantidade seja diferente entre os elementos de origem e de destino. Ative este recurso com cuidado.
+WarningUsingThisBoxSlowDown=Atenção, usando esta caixa, diminua seriamente todas as páginas que mostram a caixa.
 WarningClickToDialUserSetupNotComplete=A configuração das informações ClickToDial do seu utilizador não está completa (consulte o separador ClickToDial no sua ficha de utilizador).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Recurso desativado quando a configuração de exibição é otimizada para pessoas cegas ou navegadores de texto.
 WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior à data da fatura (%s) para a fatura %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningTooManyDataPleaseUseMoreFilters=Muitos dados (mais que linhas %s). Por favor, use mais filtros ou defina a constante %s para um limite superior.
+WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns usuários, enquanto sua taxa horária não foi definida. Um valor de 0 %s por hora foi usado, mas isso pode resultar na avaliação incorreta do tempo gasto.
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por motivos de segurança, você terá que iniciar a sessão com seu novo login antes da próxima ação.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningAnEntryAlreadyExistForTransKey=Já existe uma entrada para a chave de tradução para este idioma
+WarningNumberOfRecipientIsRestrictedInMassAction=Atenção, o número de destinatários diferentes é limitado a <b> %s </ b> ao usar as ações em massa nas listas
+WarningDateOfLineMustBeInExpenseReportRange=Atenção, a data da linha não está no intervalo do relatório de despesas
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 4886e36e09b..190d456c3a0 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Área de exportação
-ImportArea=Área de Importação
-NewExport=Nova exportação
+ExportsArea=Exportados
+ImportArea=Importar
+NewExport=Nova Exportação
 NewImport=Nova Importação
 ExportableDatas=Conjunto de dados exportáveis
 ImportableDatas=Conjunto de dados importáveis
 SelectExportDataSet=Escolha um conjunto predefinido de dados que deseje exportar...
 SelectImportDataSet=Escolha de dados que pretende importar ...
-SelectExportFields=Escolha os campos que devem exportar-se, ou escolha um perfil de exportação predefinido
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectExportFields=Escolha os campos que você deseja exportar ou selecione um perfil de exportação predefinido
+SelectImportFields=Escolha os campos do arquivo de origem que você deseja importar e o campo de destino no banco de dados movendo-os para cima e para baixo com a âncora %s ou selecione um perfil de importação predefinido:
 NotImportedFields=Os campos não importados
-SaveExportModel=Guardar este perfil de exportação assim pode reutiliza-lo posteriormente...
-SaveImportModel=Guarde este perfil de importação, se pretender reutilizá-la mais tarde ...
+SaveExportModel=Salve suas seleções como um perfil / modelo de exportação (para reutilização).
+SaveImportModel=Salvar este perfil de importação (para reutilização) ...
 ExportModelName=Nome do perfil de exportação
-ExportModelSaved=Perfil de exportação guardado com o nome de <b>%s</b>.
+ExportModelSaved=Exportar perfil salvo como <b> %s </ b>.
 ExportableFields=Campos Exportáveis
 ExportedFields=Campos a Exportar
 ImportModelName=Importar nome do perfil
-ImportModelSaved=Importar perfil guardado em <b>nome %s.</b>
+ImportModelSaved=Importar perfil salvo como <b> %s </ b>.
 DatasetToExport=Conjunto de dados a exportar
 DatasetToImport=Selecção de dados para importar
 ChooseFieldsOrdersAndTitle=Escolha a ordem dos campos...
 FieldsTitle=Título Campos
 FieldTitle=Campo título
-NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o ficheiro exportação...
+NowClickToGenerateToBuildExportFile=Agora, selecione o formato de arquivo na caixa de combinação e clique em "Generate" para construir o arquivo de exportação ...
 AvailableFormats=Formatos Disponíveis
 LibraryShort=Biblioteca
 Step=Passo
 FormatedImport=Assistente de Importação
-FormatedImportDesc1=Esta área permite realizar importações personalizadas de dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr.
-FormatedImportDesc2=O primeiro passo consiste em escolher o tipo de dado que deve importar, logo o ficheiro e a continuação escolher os campos que deseja importar.
+FormatedImportDesc1=Este módulo permite-lhe atualizar os dados existentes ou adicionar novos objetos na base de dados a partir de um ficheiro sem conhecimentos técnicos, utilizando um assistente.
+FormatedImportDesc2=O primeiro passo é escolher o tipo de dados que você deseja importar, o formato do arquivo de origem e os campos que você deseja importar.
 FormatedExport=Assistente de Exportação
-FormatedExportDesc1=Esta área permite realizar exportações personalizadas dos dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr.
-FormatedExportDesc2=O primeiro passo consiste em escolher um dos conjuntos de dados predefinidos, a continuação escolher os campos que quer exportar para o ficheiro e em que ordem.
-FormatedExportDesc3=Uma vez seleccionados os dados, é possível escolher o formato do ficheiro de exportação gerado.
+FormatedExportDesc1=Essas ferramentas permitem a exportação de dados personalizados usando um assistente, para ajudá-lo no processo sem precisar de conhecimento técnico.
+FormatedExportDesc2=O primeiro passo é escolher um conjunto de dados predefinido, em seguida, quais campos você deseja exportar e em qual ordem.
+FormatedExportDesc3=Quando os dados a exportar são selecionados, você pode escolher o formato do arquivo de saída.
 Sheet=Folha
 NoImportableData=Não existe tipo de dados importável (não existe nenhum módulo com definições de dados importável activado)
 FileSuccessfullyBuilt=Ficheiro gerado
@@ -50,10 +50,10 @@ LineTotalVAT=Montante do IVA para a linha
 TypeOfLineServiceOrProduct=Tipo de linha (0= produto, serviço de 1=)
 FileWithDataToImport=Arquivo com os dados de importação
 FileToImport=Fonte ficheiro a importar
-FileMustHaveOneOfFollowingFormat=Arquivo a ser importado deve ter um dos seguintes formatos
-DownloadEmptyExample=Download exemplo de fonte de arquivo vazio
-ChooseFormatOfFileToImport=Escolha o formato de arquivo para usar como formato de arquivo de importação clicando no %s picto para seleccioná-lo ...
-ChooseFileToImport=Escolha ficheiro a importar, em seguida, clique em picto %s ...
+FileMustHaveOneOfFollowingFormat=O arquivo a ser importado deve ter um dos seguintes formatos
+DownloadEmptyExample=Faça o download do arquivo de modelo com informações sobre o conteúdo do campo (* são campos obrigatórios)
+ChooseFormatOfFileToImport=Escolha o formato de arquivo para usar como formato de arquivo de importação clicando no ícone %s para selecioná-lo ...
+ChooseFileToImport=Carregar arquivo, em seguida, clique no ícone %s para selecionar o arquivo como arquivo de importação de origem ...
 SourceFileFormat=Formato de arquivo de origem
 FieldsInSourceFile=Os campos em arquivo fonte
 FieldsInTargetDatabase=Campos de destino na base de dados Dolibarr (negrito=obrigatório)
@@ -68,54 +68,54 @@ FieldsTarget=Domínios orientados
 FieldTarget=Campo alvo
 FieldSource=Campo da Fonte
 NbOfSourceLines=Número de linhas no arquivo de origem
-NowClickToTestTheImport=Verifique os parâmetros de importação que você definiu. Se eles estiverem correctos, clique no botão <b>&quot;%s&quot;</b> para iniciar uma simulação do processo de importação (dados não serão alterados em seu banco de dados, é apenas uma simulação para o momento) ...
-RunSimulateImportFile=Inicie a simulação de importação
+NowClickToTestTheImport=Verifique a configuração de importação que você definiu (verifique se você deve omitir as linhas de cabeçalho ou se elas serão marcadas como erros na simulação a seguir). <br> Clique no botão "<b> %s </ b>" para executar uma verificação da estrutura / conteúdo do arquivo e simular o processo de importação. <br> <b> Nenhum dado será alterado em seu banco de dados </ b>.
+RunSimulateImportFile=Executar Simulação de Importação
 FieldNeedSource=Este campo requer dados do ficheiro fonte
 SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de dados de arquivo
 InformationOnSourceFile=Informações sobre a fonte de arquivo
 InformationOnTargetTables=Informações sobre os campos de destino
 SelectAtLeastOneField=Mudar de campo pelo menos uma fonte na coluna de campos para exportar
 SelectFormat=Escolha esse formato de arquivo de importação
-RunImportFile=Lançamento arquivo de importação
-NowClickToRunTheImport=Verifique o resultado da simulação de importação. Se tudo estiver ok, o lançamento de importação definitiva.
-DataLoadedWithId=Todos os dados serão carregados com o seguinte ID de importação: <b>%s</b>
-ErrorMissingMandatoryValue=Dados obrigatórios estão vazios no arquivo de origem para <b>%s</b> campo.
-TooMuchErrors=Há ainda outra fonte <b>%s</b> linhas com erros, mas a produção tem sido limitada.
-TooMuchWarnings=Há ainda outra fonte <b>%s</b> linhas com os avisos, mas a produção tem sido limitada.
+RunImportFile=Importar dados
+NowClickToRunTheImport=Verifique os resultados da simulação de importação. Corrija qualquer erro e refaça o teste. <br> Quando a simulação não relata erros, você pode continuar importando os dados para o banco de dados.
+DataLoadedWithId=Todos os dados serão carregados com o seguinte ID de importação: <b> %s </ b> para permitir uma pesquisa neste conjunto de dados em caso de descobrir problemas no futuro.
+ErrorMissingMandatoryValue=Os dados obrigatórios estão vazios no arquivo de origem para o campo <b> %s </ b>.
+TooMuchErrors=Ainda existem <b> %s </ b> outras linhas de origem com erros, mas a saída foi limitada.
+TooMuchWarnings=Ainda existem <b> %s </ b> outras linhas de origem com avisos, mas a saída foi limitada.
 EmptyLine=Linha em branco (serão descartadas)
-CorrectErrorBeforeRunningImport=Primeiro, você deve corrigir todos os erros antes de executar a importação definitiva.
+CorrectErrorBeforeRunningImport=Você <b> deve </ b> corrigir todos os erros <b> antes de </ b> executar a importação definitiva.
 FileWasImported=O arquivo foi importado com <b>%s</b> número.
-YouCanUseImportIdToFindRecord=You can find all imported record in your database by filtering on field <b>import_key='%s'</b>.
+YouCanUseImportIdToFindRecord=Você pode encontrar todos os registros importados em seu banco de dados, filtrando no campo <b> import_key = '%s' </ b>.
 NbOfLinesOK=Número de linhas sem erros e sem avisos: <b>%s.</b>
 NbOfLinesImported=Número de linhas de importados com sucesso: <b>%s.</b>
 DataComeFromNoWhere=Valor para inserir vem do nada no arquivo fonte.
 DataComeFromFileFieldNb=Valor para inserir o número vem <b>%s</b> campo no arquivo fonte.
-DataComeFromIdFoundFromRef=Valor que vem de série <b>%s</b> campo de arquivo de origem será usado para encontrar id do objecto pai para usar <b>(%s</b> objecto Assim, o que tem a ref. Partir do arquivo fonte deve existir em Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromRef=O valor que vem do número de campo <b> %s </ b> do arquivo de origem será usado para encontrar o id do objeto pai a ser usado (portanto, o objeto <b> %s </ b> que possui a referência do arquivo de origem deve existir no banco de dados).
+DataComeFromIdFoundFromCodeId=O código que vem do número de campo <b> %s </ b> do arquivo de origem será usado para localizar o id do objeto pai a ser usado (portanto, o código do arquivo de origem deve existir no dicionário <b> %s </ b> ). Observe que, se você souber o id, também poderá usá-lo no arquivo de origem em vez do código. A importação deve funcionar nos dois casos.
 DataIsInsertedInto=Dados provenientes de arquivo de origem será inserido no seguinte campo:
-DataIDSourceIsInsertedInto=A identificação do objecto pai encontrado usando os dados no arquivo de origem, será inserido no campo seguinte:
+DataIDSourceIsInsertedInto=O id do objeto pai foi encontrado usando os dados no arquivo de origem, será inserido no seguinte campo:
 DataCodeIDSourceIsInsertedInto=O ID da linha foi encontrado o pai a partir do código, será inserido no campo seguinte:
 SourceRequired=Valor dos dados é obrigatória
 SourceExample=Exemplo de valores de dados possíveis
 ExampleAnyRefFoundIntoElement=Qualquer ref encontrado para <b>%s</b> elemento
-ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou ID) encontrado no dicionário <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> formato de arquivo (. Csv). <br> Este é um formato de arquivo texto onde os campos são separados por separador [%s]. Se o separador é encontrado dentro de um conteúdo do campo, o campo é arredondado por volta de carácter [%s]. Caractere de escape para fugir personagem redonda é [%s].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=Opções CSV
-Separator=Separador
-Enclosure=Invólucro
+ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou id.) encontrado no dicionário <b>%s</b>
+CSVFormatDesc=Formato de arquivo <b> Comma Separated Value </ b> (.csv). <br> Este é um formato de arquivo de texto no qual os campos são separados por um separador [%s]. Se o separador for encontrado dentro de um conteúdo de campo, o campo será arredondado por um caractere arredondado [%s]. O personagem de escape para escapar do personagem redondo é [%s].
+Excel95FormatDesc=Formato de arquivo <b> Excel </ b> (.xls) <br> Este é o formato nativo do Excel 95 (BIFF5).
+Excel2007FormatDesc=Formato de arquivo <b> Excel </ b> (.xlsx) <br> Este é o formato nativo do Excel 2007 (SpreadsheetML).
+TsvFormatDesc=Formato de arquivo <b> Tab Separated Value </ b> (.tsv) <br> Este é um formato de arquivo de texto no qual os campos são separados por um tabulador [tab].
+ExportFieldAutomaticallyAdded=O campo <b> %s </ b> foi adicionado automaticamente. Isso evitará que você tenha linhas semelhantes para serem tratadas como registro duplicado (com este campo adicionado, todas as linhas possuirão seu próprio ID e serão diferentes).
+CsvOptions=Opções de formato CSV
+Separator=Separador de campo
+Enclosure=Delimitador de Cadeia
 SpecialCode=Código Especial
 ExportStringFilter=%% permite a substituição de um ou mais caracteres no texto
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtra por um ano / mês / dia por YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: filtros ao longo de um intervalo de anos / meses / mês <br>> AAAA,> AAAAM,> AAAAMMDD : filtros em todos os anos / meses / dias seguintes <YYYY, <YYYYMM, <YYYYMMDD: filtros em todos os anos / meses anteriores / dias
+ExportNumericFilter=NNNNN filtra por um valor <br> NNNNN + NNNNN filtra por um intervalo de valores <br> <NNNNN filtra por valores mais baixos <br >> NNNNN filtra por valores mais altos
 ImportFromLine=Importar a partir da linha número
 EndAtLineNb=Terminar na linha número
-ImportFromToLine=Importar as linhas número (de - a)
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
+ImportFromToLine=Limite de intervalo (de - para) por exemplo. omitir linha de cabeçalho
+SetThisValueTo2ToExcludeFirstLine=Por exemplo, defina esse valor como 3 para excluir as duas primeiras linhas
+KeepEmptyToGoToEndOfFile=Mantenha este campo vazio para ir até o final do arquivo
 SelectPrimaryColumnsForUpdateAttempt=Selecione a(s) coluna(s) para usar como chave primária para a tentativa de atualização
 UpdateNotYetSupportedForThisImport=Atualização não é suportada para este tipo de importação (apenas inserção)
 NoUpdateAttempt=Não foi realizada nenhuma tentativa de atualização, apenas de inserção
@@ -127,7 +127,7 @@ FilteredFields=Campos filtrados
 FilteredFieldsValues=Valor para filtrar
 FormatControlRule=Regra de controle de formato
 ## imports updates
-KeysToUseForUpdates=Key to use for updating data
+KeysToUseForUpdates=Chave (coluna) a ser usada para <b> atualizar </ b> dados existentes
 NbInsert=Número de linhas inseridas: %s
 NbUpdate=Número de linhas atualizadas: %s
 MultipleRecordFoundWithTheseFilters=Foram encontrados vários registos com esses filtros: %s
diff --git a/htdocs/langs/pt_PT/help.lang b/htdocs/langs/pt_PT/help.lang
index 089f50134bb..105b30c91e2 100644
--- a/htdocs/langs/pt_PT/help.lang
+++ b/htdocs/langs/pt_PT/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=On-line em tempo real / suporte remoto
 OtherSupport=Outro apoio
 ToSeeListOfAvailableRessources=Para entrar em contato / ver recursos disponíveis:
 HelpCenter=Central de Ajuda
-DolibarrHelpCenter=Dolibarr Centro de Ajuda e Suporte
-ToGoBackToDolibarr=Caso contrário, clique <a href="%s">aqui para utilizar Dolibarr</a>
-TypeOfSupport=Fonte de apoio
+DolibarrHelpCenter=Centro de ajuda e suporte Dolibarr
+ToGoBackToDolibarr=Caso contrário, <a href="%s"> clique aqui para continuar a usar o Dolibarr </a>.
+TypeOfSupport=Tipo de suporte
 TypeSupportCommunauty=Comunidade (grátis)
 TypeSupportCommercial=Comercial
 TypeOfHelp=Tipo
@@ -15,12 +15,9 @@ NeedHelpCenter=Precisa de ajuda ou suporte?
 Efficiency=Eficiência
 TypeHelpOnly=Ajuda só
 TypeHelpDev=Ajuda + Desenvolvimento
-TypeHelpDevForm=Ajuda + Desenvolvimento + Formação
-ToGetHelpGoOnSparkAngels1=Algumas empresas podem fornecer uma forma mais rápida (por vezes imediata) e mais eficiente de suporte on-line, com acesso remoto ao seu computador. Tal ajuda pode ser encontrada <b>em %s</b> web site:
-ToGetHelpGoOnSparkAngels3=Você também pode ir para a lista de todas as ajudas disponíveis para Dolibarr, para este clique no botão
-ToGetHelpGoOnSparkAngels2=Às vezes, não há nenhuma empresa disponível no momento em que você faça a sua pesquisa, por isso acho que para mudar o filtro para procurar "todas as disponibilidade". Você será capaz de enviar mais pedidos.
-BackToHelpCenter=Caso contrário, clique aqui para ir <a href="%s">de volta ao centro de ajuda home page.</a>
-LinkToGoldMember=Você pode chamar um assistente selecionado pelo Dolibarr para o seu idioma ( %s) clicando em seu Widget (status e preço máximo são atualizadas automaticamente):
-PossibleLanguages=Línguas de apoio
-SubscribeToFoundation=Ajude o  projeto Dolibarr, inscreva-se na fundação
-SeeOfficalSupport=Para obter suporte oficial do Dolibarr na sua língua: <br><b><a href="%s" target="_blank">%s</a></b>
+TypeHelpDevForm=Ajuda + Desenvolvimento + Treinamento
+BackToHelpCenter=Caso contrário, <a href="%s"> volte para a página inicial da Central de Ajuda </a>.
+LinkToGoldMember=Você pode chamar um dos treinadores pré-selecionados pelo Dolibarr para o seu idioma (%s) clicando no Widget (status e preço máximo atualizados automaticamente):
+PossibleLanguages=Idiomas suportados
+SubscribeToFoundation=Ajude o projeto Dolibarr, assine a fundação
+SeeOfficalSupport=Para obter suporte oficial do Dolibarr no seu idioma: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 2e06bb85b2b..9162c2c35e2 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=GRH
-Holidays=Licenças
-CPTitreMenu=Licenças
+Holidays=Sair
+CPTitreMenu=Sair
 MenuReportMonth=Comunicado mensal
 MenuAddCP=Novo pedido de licença
-NotActiveModCP=Deve ativar o módulo de Licenças para ver esta página.
+NotActiveModCP=Você deve ativar o módulo Deixar para ver esta página.
 AddCP=Efetue um pedido de licença
 DateDebCP=Data de início
 DateFinCP=Data de fim
@@ -15,18 +15,18 @@ ApprovedCP=Aprovado
 CancelCP=Cancelado
 RefuseCP=Recusou
 ValidatorCP=Aprovador
-ListeCP=Lista de pedidos de licença
-LeaveId=Leave ID
+ListeCP=Lista de licença
+LeaveId=ID da licença
 ReviewedByCP=Será aprovado por
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=Firstname of approval user
-UserForApprovalLastname=Lastname of approval user
-UserForApprovalLogin=Login of approval user
+UserForApprovalID=ID do utilizador aprovador
+UserForApprovalFirstname=Primeiro nome do usuário de aprovação
+UserForApprovalLastname=Último nome do usuário de aprovação
+UserForApprovalLogin=Login do utilizador aprovador
 DescCP=Descrição
 SendRequestCP=Criar pedido de licença
 DelayToRequestCP=Os pedidos de licença devem ser efetuados com pelo menos <b>%s dia(s)</b> de antecedência.
-MenuConfCP=Fazer o balanço das licenças
-SoldeCPUser=Balanço das licenças é <b>%s</b> dias
+MenuConfCP=Saldo de licença
+SoldeCPUser=Deixar saldo é <b> %s </ b> dias.
 ErrorEndDateCP=Você deve selecionar uma data de fim maior do que a data de início.
 ErrorSQLCreateCP=Ocorreu um erro SQL durante a criação:
 ErrorIDFicheCP=Ocorreu um erro, o pedido de licença não existe.
@@ -35,14 +35,14 @@ ErrorUserViewCP=Você não está autorizado a consultar este pedido de licença.
 InfosWorkflowCP=Informação do fluxo de trabalho
 RequestByCP=Pedido por
 TitreRequestCP=Pedido de licença
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
+TypeOfLeaveId=Tipo de ID de licença
+TypeOfLeaveCode=Tipo de licença (código)
+TypeOfLeaveLabel=Tipo de licença (nome)
 NbUseDaysCP=Número de dias de férias consumidos
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPShort=Dias consumidos
+NbUseDaysCPShortInMonth=Dias consumidos no mês
+DateStartInMonth=Data de início no mês
+DateEndInMonth=Data final no mês
 EditCP=Editar
 DeleteCP=Eliminar
 ActionRefuseCP=Recusar
@@ -71,7 +71,7 @@ DateRefusCP=Data de rejeição
 DateCancelCP=Data de cancelamento
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Você não é o aprovador atribuído
 MotifCP=Motivo
 UserCP=Utilizador
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,11 +81,11 @@ LogCP=Registo de actualizações de dias disponíveis
 ActionByCP=Realizado por
 UserUpdateCP=Para o utilizador
 PrevSoldeCP=Balanço prévio
-NewSoldeCP=Novo balanço
+NewSoldeCP=Novo Balanço
 alreadyCPexist=Um pedido de licença já foi feito para esse período.
 FirstDayOfHoliday=Primeiro dia de férias
 LastDayOfHoliday=Último dia de férias
-BoxTitleLastLeaveRequests=Os últimos %s pedidos de licença modificados
+BoxTitleLastLeaveRequests=Últimos %s pedidos de licença modificados
 HolidaysMonthlyUpdate=Atualização mensal
 ManualUpdate=Atualização manual
 HolidaysCancelation=Cancelamento do pedido de licença
@@ -94,15 +94,15 @@ EmployeeFirstname=Primeiro do nome do funcionário
 TypeWasDisabledOrRemoved=O tipo de licença (ID %s) foi desativado ou removido
 LastHolidays=Últimos %s pedidos de licença
 AllHolidays=Todos os pedidos de licença
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+HalfDay=Meio dia
+NotTheAssignedApprover=Você não é o aprovador atribuído
+LEAVE_PAID=Férias pagas
+LEAVE_SICK=Baixa médica
+LEAVE_OTHER=Outra tipo de licença
+LEAVE_PAID_FR=Férias pagas
 ## Configuration du Module ##
-LastUpdateCP=As últimas atualizações automáticas de alocação de licenças
-MonthOfLastMonthlyUpdate=Mês das últimas atualizações automáticas de alocação de licenças
+LastUpdateCP=Atualização automática mais recente da alocação de licenças
+MonthOfLastMonthlyUpdate=Mês da última atualização automática de alocação de licenças
 UpdateConfCPOK=Atualizado com sucesso.
 Module27130Name= Gestão de pedidos de licença
 Module27130Desc= Gestão de pedidos de licença
@@ -112,7 +112,7 @@ NoticePeriod=Período de aviso
 HolidaysToValidate=Validar pedidos de licença
 HolidaysToValidateBody=Abaixo encontra-se um pedido de licença por validar
 HolidaysToValidateDelay=Este pedido de licença ocorrerá dentro de um período inferior a %s dias.
-HolidaysToValidateAlertSolde=O utilizador que fez este pedido de licença não tem dias disponíveis suficientes.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Pedidos de licença validados
 HolidaysValidatedBody=O seu pedido de licença para o período de %s a %s foi validado.
 HolidaysRefused=Pedido negado
@@ -121,4 +121,9 @@ HolidaysCanceled=Pedido de licença cancelado
 HolidaysCanceledBody=O seu pedido de licença para o período de %s a %s foi cancelado.
 FollowedByACounter=1: Este tipo de licença precisa ser seguido por um contador. O contador é incrementado manualmente ou automaticamente, quando um pedido de licença é validado o contador é diminuído.<br> 0: Não seguido por um contador.
 NoLeaveWithCounterDefined=Não há tipos de licença definidos que precisam ser seguidos por um contador
-GoIntoDictionaryHolidayTypes=Entre em <strong> Início - Configuração - Dicionários - Tipo de licenças</strong> para configurar os diferentes tipos de licença.
+GoIntoDictionaryHolidayTypes=Vá para <strong> Home - Configuração - Dicionários - Tipo de licença </ strong> para configurar os diferentes tipos de folhas.
+HolidaySetup=Configuração do módulo Holiday
+HolidaysNumberingModules=Deixar modelos de numeração de pedidos
+TemplatePDFHolidays=Modelo para solicitações de licenças PDF
+FreeLegalTextOnHolidays=Texto livre em PDF
+WatermarkOnDraftHolidayCards=Marcas d'água em pedidos de licença de rascunho
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 3f0bd15b2e6..765c09c94fc 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Basta seguir as instruções passo-a-passo.
 MiscellaneousChecks=Verificar pré-requisitos
 ConfFileExists=O ficheiro de configuração <b>%s</b> já existe.
-ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro de configuração <b>%s</b> não existe e não foi possível criá-lo!
+ConfFileDoesNotExistsAndCouldNotBeCreated=O arquivo de configuração <b> %s </ b> não existe e não pôde ser criado!
 ConfFileCouldBeCreated=Foi criado o ficheiro de configuração <b>%s</b>.
-ConfFileIsNotWritable=O ficheiro de configuração <b>%s</b> não é gravável. Verifique as permissões. Na primeira instalação, o seu servidor da Web tem de ter permissões de gravação para este ficheiro durante o processo de configuração ("chmod 666", por exemplo num SO, tal como o Unix).
+ConfFileIsNotWritable=O arquivo de configuração <b> %s </ b> não é gravável. Verifique as permissões. Para a primeira instalação, seu servidor da web deve ser capaz de gravar nesse arquivo durante o processo de configuração ("chmod 666", por exemplo, em um SO Unix como).
 ConfFileIsWritable=O ficheiro de configuração <b>%s</b> é gravável.
 ConfFileMustBeAFileNotADir=O ficheiro de configuração <b> %s </b> deve ser um ficheiro, não um diretório.
-ConfFileReload=Recarregar toda a informação do ficheiro de configuração.
+ConfFileReload=Recarregando parâmetros do arquivo de configuração.
 PHPSupportSessions=Este PHP suporta sessões.
 PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST.
-PHPSupportPOSTGETKo=É possível que a sua configuração PHP não suporte as variáveis POST e/ou GET. Verifique o seu parâmetro <b>variables_order</b> no php.ini
-PHPSupportGD=Este PHP suporta funções gráficas GD .
-PHPSupportCurl=Esta versão do PHP suporta Curl.
-PHPSupportUTF8=Este PHP suporte funções UTF8.
+PHPSupportPOSTGETKo=É possível que sua configuração do PHP não suporte variáveis ​​POST e / ou GET. Verifique o parâmetro <b> variables_order </ b> no php.ini.
+PHPSupportGD=Este PHP suporta funções gráficas do GD.
+PHPSupportCurl=Este PHP suporta o Curl.
+PHPSupportUTF8=Este PHP suporta funções UTF8.
 PHPMemoryOK=A sua memória máxima da sessão PHP está definida para <b>%s.</b> Isto deverá ser suficiente.
-PHPMemoryTooLow=A sua memória máxima da sessão PHP está definida para <b>%s</b> bytes. Isto deve ser muito baixo. Altere o seu <b>php.ini</b> para definir o parâmetro <b>memory_limit</b> para pelo menos <b>%s</b> bytes.
-Recheck=Clique aqui para um teste mais significativo
-ErrorPHPDoesNotSupportSessions=A sua instalação PHP não suporta sessões. Esta função é necessária para que o Dolibarr funcione. Verifique a sua configuração PHP.
-ErrorPHPDoesNotSupportGD=A sua instalação PHP não suporta a função gráfica GD. Não terá nenhum gráfico disponível.
+PHPMemoryTooLow=Sua memória de sessão do PHP max está configurada para <b> %s </ b> bytes. Isso é muito baixo. Altere seu <b> php.ini </ b> para definir o parâmetro <b> memory_limit </ b> para pelo menos <b> %s </ b> bytes.
+Recheck=Clique aqui para um teste mais detalhado
+ErrorPHPDoesNotSupportSessions=Sua instalação do PHP não suporta sessões. Este recurso é necessário para permitir que o Dolibarr funcione. Verifique sua configuração do PHP e permissões do diretório de sessões.
+ErrorPHPDoesNotSupportGD=Sua instalação do PHP não suporta funções gráficas do GD. Nenhum gráfico estará disponível.
 ErrorPHPDoesNotSupportCurl=A sua instalação PHP não suporta Curl.
-ErrorPHPDoesNotSupportUTF8=A sua instalação PHP não suporta as funções UTF8. O Dolibarr não pode funcionar corretamente. Resolva isto antes de instalar o Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Sua instalação do PHP não suporta funções UTF8. Dolibarr não pode funcionar corretamente. Resolva isso antes de instalar o Dolibarr.
 ErrorDirDoesNotExists=A diretoria %s não existe.
-ErrorGoBackAndCorrectParameters=Voltar atrás e corrigir os parâmetros errados.
+ErrorGoBackAndCorrectParameters=Volte e verifique / corrija os parâmetros.
 ErrorWrongValueForParameter=Pode ter inserido um valor incorreto para o parâmetro ' %s'.
 ErrorFailedToCreateDatabase=Não foi possível criar a base de dados' %s'.
 ErrorFailedToConnectToDatabase=Não foi possível ligar à base de dados' %s'.
 ErrorDatabaseVersionTooLow=A versão da base de dados (%s) é muito antiga. É necessária a versão %s ou superior.
 ErrorPHPVersionTooLow=A versão PHP é muito antiga. É necessária a versão %s.
-ErrorConnectedButDatabaseNotFound=Conexão ao servidor bem sucedida, mas não foi encontrada a base de dados ' %s'.
+ErrorConnectedButDatabaseNotFound=Conexão ao servidor bem-sucedida, mas o banco de dados '%s' não foi encontrado.
 ErrorDatabaseAlreadyExists=A base de dados' %s' já existe.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Se a base de dados não existir, volte e verifique a opção "Criar base de dados".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Se o banco de dados não existir, volte e marque a opção "Criar banco de dados".
 IfDatabaseExistsGoBackAndCheckCreate=Se a base de dados já existir, volte e desmarque a opção "Criar base de dados".
-WarningBrowserTooOld=A versão do navegador é muito antiga. Atualize o seu navegador para uma versão mais recente do Firefox, Chrome ou Ópera.
+WarningBrowserTooOld=A versão do navegador é muito antiga. Atualizar o seu navegador para uma versão recente do Firefox, Chrome ou Opera é altamente recomendado.
 PHPVersion=Versão PHP
 License=A utilizar a licença
 ConfigurationFile=Ficheiro de Configuração
@@ -45,22 +45,23 @@ DolibarrDatabase=Base de Dados Dolibarr
 DatabaseType=Tipo de base de dados
 DriverType=Tipo de Controlador
 Server=Servidor
-ServerAddressDescription=Nome ou endereço IP para o servidor de dados, normalmente 'localhost' ao banco de dados está hospedado no mesmo servidor que servidor web
+ServerAddressDescription=Nome ou endereço de IP para o servidor da base de dados. Normalmente 'hospedeiro local' quando a base de dados está alojada no mesmo servidor que o servidor da Web.
 ServerPortDescription=A porta do servidor da base de dados. Mantenha em branco, se desconhecida.
 DatabaseServer=Servidor da Base de Dados
 DatabaseName=Nome da Base de Dados
-DatabasePrefix=Tabela de prefixos da base de dados
-AdminLogin=Início de sessão para o administrador da base de dados Dolibarr.
-PasswordAgain=Contrassenha
+DatabasePrefix=Prefixo da tabela de banco de dados
+DatabasePrefixDescription=Prefixo da tabela do banco de dados. Se vazio, o padrão é llx_.
+AdminLogin=Conta de usuário para o proprietário do banco de dados Dolibarr.
+PasswordAgain=Redigite a confirmação da senha
 AdminPassword=A senha para o utilizador da base de dados Dolibarr.
 CreateDatabase=Criar base de dados
-CreateUser=Crie o proprietário ou conceda-lhe permissão na base de dados
+CreateUser=Crie uma conta de usuário ou conceda permissão de conta de usuário no banco de dados Dolibarr
 DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso de Administrador
-CheckToCreateDatabase=Marque a caixa se a base de dados não existir e se deverá ser criada. <br> Neste caso, deve preencher o nome/senha para a conta de administrador, no fim desta página.
-CheckToCreateUser=Selecione se o proprietário da base de dados não existir e deve ser criado, ou se ele existe mas a base de dados não existe e as permissões devem ser concedidas.<br>Neste caso, você deve escolher seu nome de utilizador e palavra-passe e também preencher o nome de utilizador/palavra-passe para a conta do super-utilizador na parte inferior desta página. Se esta caixa estiver desmarcada, a base de dados do proprietário deve existir e deve ser possível ter acesso a esta.
-DatabaseRootLoginDescription=Início de sessão do utilizador autorizado para criar as novas bases de dados ou novos utilizadores, obrigatório se a sua base de dados ou o administrador já existirem.
-KeepEmptyIfNoPassword=Deixar em branco se o utilizador não tiver uma senha (evitar isto)
-SaveConfigurationFile=Guardar valores
+CheckToCreateDatabase=Marque a caixa se o banco de dados ainda não existir e, portanto, ele deve ser criado. <br> Nesse caso, você também deve preencher o nome de usuário e a senha da conta de superusuário na parte inferior desta página.
+CheckToCreateUser=Marque a caixa se: <br> a conta de usuário do banco de dados ainda não existir e assim deve ser criada, ou se a conta do usuário existir, mas o banco de dados não existir e as permissões tiverem de ser concedidas. <br> Nesse caso, você deve digitar a conta de usuário e senha e <b> também </ b> o nome da conta de superusuário e senha na parte inferior desta página. Se esta caixa estiver desmarcada, o proprietário e a senha do banco de dados já devem existir.
+DatabaseRootLoginDescription= Nome da conta do super utilizador (para criar nova base de dados ou novos utilizadores), obrigatório se a base de dados ou o seu proprietário ainda não existir.
+KeepEmptyIfNoPassword=Deixe em branco se o superusuário não tiver senha (NÃO é recomendado)
+SaveConfigurationFile=Salvando parâmetros para
 ServerConnection=Conexão ao servidor
 DatabaseCreation=Criação da Base de Dados
 CreateDatabaseObjects=Criação dos objetos da base de dados
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Crie chaves estrangeiras e índices para a tabela %s
 OtherKeysCreation=Chaves estrangeiras e criação de índex
 FunctionsCreation=Criação de Funções
 AdminAccountCreation=Criação da sessão do Administrador
-PleaseTypePassword=Por favor, insira uma senha, não são permitidas senhas em branco!
-PleaseTypeALogin=Por favor, digite um nome!
-PasswordsMismatch=As senhas não coincidem, por favor, tente de novo!
+PleaseTypePassword=Por favor, digite uma senha, senhas vazias não são permitidas!
+PleaseTypeALogin=Por favor, digite um login!
+PasswordsMismatch=As senhas diferem, por favor, tente novamente!
 SetupEnd=Fim da Configuração
 SystemIsInstalled=Esta instalação está completa.
 SystemIsUpgraded=O Dolibarr foi atualizado com sucesso.
@@ -81,15 +82,15 @@ YouNeedToPersonalizeSetup=Precisa de configurar o Dolibarr de acordo com as suas
 AdminLoginCreatedSuccessfuly=Sessão de administrador Dolibarr '<b>%s</b>' criada com sucesso.
 GoToDolibarr=Ir para Dolibarr
 GoToSetupArea=Ir para Dolibarr (área de configuração)
-MigrationNotFinished=A versão da base de dados não está completamente atualizada, assim terá que executar novamente o processo de atualização.
+MigrationNotFinished=A versão do banco de dados não está completamente atualizada: execute o processo de atualização novamente.
 GoToUpgradePage=Ir novamente para a página de atualização
 WithNoSlashAtTheEnd=Sem a barra "/" no fim
-DirectoryRecommendation=É recomendado a utilização da diretoria fora da sua diretoria das suas páginas da web.
+DirectoryRecommendation=Recomenda-se usar um diretório fora das páginas da web.
 LoginAlreadyExists=Já existe
 DolibarrAdminLogin=Sessão Administrador Dolibarr
-AdminLoginAlreadyExists=A conta de administrador <b>' %s'</b> Dolibarr já existe. Volte atrás, se desejar criar uma conta.
+AdminLoginAlreadyExists=Conta de administrador Dolibarr '<b> %s </ b>' já existe. Volte se você quiser criar outro.
 FailedToCreateAdminLogin=Falha na criação da conta de Administrador do Dolibarr.
-WarningRemoveInstallDir=Aviso: por motivos de segurança, assim que a instalação ou a atualização estiverem completas, e para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome <b>install.lock</b> na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.</b>
+WarningRemoveInstallDir=Atenção, por razões de segurança, assim que a instalação ou atualização estiver completa, você deve adicionar um arquivo chamado <b> install.lock </ b> no diretório de documentos do Dolibarr para evitar o uso acidental / malicioso das ferramentas de instalação novamente.
 FunctionNotAvailableInThisPHP=Não disponível neste PHP
 ChoosedMigrateScript=Escolhido migrar script
 DataMigration=Migração da base-de-dados (dados)
@@ -97,49 +98,49 @@ DatabaseMigration=Migração da base-de-dados (estrutura + alguns dados)
 ProcessMigrateScript=Processamento do "Script"
 ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar"...
 FreshInstall=Instalação Nova
-FreshInstallDesc=Utilize este modo, se esta for a sua primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleta, mas se deseja atualizar a sua versão, selecione o modo "Atualizar".
+FreshInstallDesc=Use este modo se esta for sua primeira instalação. Caso contrário, este modo pode reparar uma instalação anterior incompleta. Se você quiser atualizar sua versão, escolha o modo "Atualizar".
 Upgrade=Atualizar
 UpgradeDesc=Utilize este modo se tiver substituído os ficheiros Dolibarr antigos com ficheiros de uma versão mais recente. Isto irá atualizar a sua base de dados e os dados.
 Start=Iniciar
 InstallNotAllowed=Configuração não permitida pelas permissões <b>conf.php</b>
 YouMustCreateWithPermission=Deve criar o ficheiro %s e definir as permissões de gravação deste para o servidor da Web, durante o processo de instalação.
-CorrectProblemAndReloadPage=Por favor, corrija o problema e pressione em 'F5' para recarregar a página.
+CorrectProblemAndReloadPage=Por favor, corrija o problema e pressione F5 para recarregar a página.
 AlreadyDone=Já migrada
 DatabaseVersion=Versão da Base de Dados
 ServerVersion=Versão do Servidor da Base de Dados
 YouMustCreateItAndAllowServerToWrite=Deve criar esta diretoria e permitir que o servidor da web grave nela.
 DBSortingCollation=Ordem da ordenação dos carateres
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Pediu para criar a base de dados <b>%s</b>, mas para isso, o Dolibarr precisa de ligar ao servidor <b>%s</b> com permissões de administrador <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Pediu para criar a base de dados da sessão <b>%s,</b> mas para isso, o Dolibarr precisa de ligar ao servidor <b>%s</b> com permissões de administrador <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=Como conexão falhou, de acolhimento ou super usuário parâmetros devem ser errado.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Você selecionou criar o banco de dados <b> %s </ b>, mas para isso, o Dolibarr precisa se conectar ao servidor <b> %s </ b> com permissões de super usuário <b> %s </ b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Você selecionou o usuário do banco de dados de criação <b> %s </ b>, mas para isso, o Dolibarr precisa se conectar ao servidor <b> %s </ b> com permissões de super usuário <b> %s </ b>.
+BecauseConnectionFailedParametersMayBeWrong=A ligação à base de dados falhou: os parâmetros do hospedeiro ou super utilizador devem estar errados.
 OrphelinsPaymentsDetectedByMethod=Detetado o pagamento Orphelins pelo método %s
 RemoveItManuallyAndPressF5ToContinue=Remova-o manualmente e pressione F5 para continuar.
 FieldRenamed=Campo renomeado
-IfLoginDoesNotExistsCheckCreateUser=Se a sessão ainda não existir, deve marcar a opção "Criar Utilizador"
-ErrorConnection=Servidor <b>" %s",</b> nome do banco de dados <b>" %s",</b> login <b>" %s",</b> ou banco de dados senha pode estar errado ou PHP versão cliente pode ser muito velho para comparação de dados versão.
+IfLoginDoesNotExistsCheckCreateUser=Se o usuário ainda não existe, você deve marcar a opção "Criar usuário"
+ErrorConnection=Servidor "<b> %s </ b>", nome do banco de dados "<b> %s </ b>", login "<b> %s </ b>", ou a senha do banco de dados pode estar errada ou a versão do cliente PHP pode estar muito antigo em comparação com a versão do banco de dados.
 InstallChoiceRecommanded=Recomendado opção de instalar a versão do seu <b>%s %s</b> versão atual
 InstallChoiceSuggested=<b>Opção de instalação sugerida pelo instalador.</b>
-MigrateIsDoneStepByStep=A versão de destino (%s) tem uma abertura de várias versões, então assistente de instalação vai voltar a sugerir próxima migração uma vez que esta será uma final.
-CheckThatDatabasenameIsCorrect=Verifique se o nome do banco de dados <b>"%s"</b> está correto.
+MigrateIsDoneStepByStep=A versão de destino (%s) tem um intervalo de várias versões. O assistente de instalação voltará para sugerir uma migração adicional quando esta estiver concluída.
+CheckThatDatabasenameIsCorrect=Verifique se o nome do banco de dados "<b> %s </ b>" está correto.
 IfAlreadyExistsCheckOption=Se esse nome está correto e que banco de dados ainda não existe, você deve marcar a opção "Criar banco de dados".
 OpenBaseDir=parametr openbasedir PHP
-YouAskToCreateDatabaseSoRootRequired=Marcou a caixa "Criar Base de Dados". Para isto, precisa de indicar o nome/senha do administrador (base do formulário).
-YouAskToCreateDatabaseUserSoRootRequired=Marcou a caixa "Criar base de dados do administrador". Para isso, precisa do início de sessão/senha de administrador (base do formulário).
-NextStepMightLastALongTime=etapa atual pode durar vários minutos. Por favor, aguarde até a próxima tela é mostrada completamente antes de continuar.
+YouAskToCreateDatabaseSoRootRequired=Você marcou a caixa "Criar banco de dados". Para isso, você precisa fornecer o login / senha do superusuário (parte inferior do formulário).
+YouAskToCreateDatabaseUserSoRootRequired=Você marcou a caixa "Criar proprietário do banco de dados". Para isso, você precisa fornecer o login / senha do superusuário (parte inferior do formulário).
+NextStepMightLastALongTime=O passo atual pode levar vários minutos. Por favor, aguarde até que a próxima tela seja mostrada completamente antes de continuar.
 MigrationCustomerOrderShipping=Migrar para o transporte de armazenamento ordens do cliente
 MigrationShippingDelivery=Atualizar armazenamento de transporte
 MigrationShippingDelivery2=Atualizar armazenamento de transporte 2
 MigrationFinished=Migração terminada
-LastStepDesc=<strong>Último passo:</strong> Defina aqui o login ea senha que você planeja usar para se conectar ao software. Não perca isso, pois é a conta para administrar todos os outros.
+LastStepDesc=<strong> Last step </ strong>: Defina aqui o login e a senha que você deseja usar para se conectar ao Dolibarr. <b> Não perca isso, pois é a conta principal para administrar todas as outras contas de usuário adicionais. </ b>
 ActivateModule=Ative o módulo %s
 ShowEditTechnicalParameters=Clique aqui para mostrar/editar os parâmetros avançados (modo avançado)
-WarningUpgrade=Aviso:\nEfetuou previamente uma cópia de segurança da base-de-dados?\nIsto é altamente recomendado: por exemplo, no caso de existirem falhas nos sistemas de base-de-dados (na versão 5.5.40/41/42/43 do MySQL), alguns dados ou tabelas poderão perder-se durante este processo, daí recomenda-se que faça uma cópia completa da sua base-de-dados antes de iniciar o processo de migração.\nClique em OK para iniciar o processo de migração...
-ErrorDatabaseVersionForbiddenForMigration=A sua versão da base-de-dados é %s. Esta versão possui um erro que poderá resultar em perda de dados se efetuar uma alteração da estrutura, como é efetuada durante o processo de migração. Como tal, a migração não será possível de efetuar enquanto a versão da base-de-dados for atualizada (lista de versões que contêm erros: %s)
-KeepDefaultValuesWamp=Você usa o DoliWamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
-KeepDefaultValuesDeb=Você pode usar o assistente de configuração Dolibarr de um Ubuntu ou um pacote Debian, então os valores propostos aqui já estão otimizados. Apenas a senha do proprietário do banco de dados para criar tem de ser concluída. Alterar parâmetros outros apenas se você sabe o que fazer.
-KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
-KeepDefaultValuesProxmox=Você usa o assistente de configuração Dolibarr de um appliance virtual Proxmox, para valores propostos aqui já são otimizados. Alterá-los apenas se você sabe o que fazer.
-UpgradeExternalModule=Corra o processo de atualização dedicado dos módulos externos
+WarningUpgrade=Aviso:\nVocê executou um backup de banco de dados primeiro?\nIsso é altamente recomendado. Perda de dados (devido a erros no mysql versão 5.5.40 / 41/42/43) pode ser possível durante este processo, por isso é essencial ter um despejo completo do seu banco de dados antes de iniciar qualquer migração.\n\nClique em OK para iniciar o processo de migração ...
+ErrorDatabaseVersionForbiddenForMigration=Sua versão do banco de dados é %s. Ele tem um bug crítico, tornando possível a perda de dados se você fizer alterações estruturais em seu banco de dados, como é exigido pelo processo de migração. Por sua razão, a migração não será permitida até que você atualize seu banco de dados para uma versão de camada (corrigida) (lista de versões conhecidas de bugs: %s)
+KeepDefaultValuesWamp=Você usou o assistente de configuração Dolibarr da DoliWamp, então os valores aqui propostos já estão otimizados. Mude-os somente se você souber o que está fazendo.
+KeepDefaultValuesDeb=Você usou o assistente de configuração do Dolibarr a partir de um pacote do Linux (Ubuntu, Debian, Fedora ...), então os valores aqui propostos já estão otimizados. Somente a senha do proprietário do banco de dados a ser criada deve ser inserida. Altere outros parâmetros apenas se você souber o que está fazendo.
+KeepDefaultValuesMamp=Você usou o assistente de configuração Dolibarr do DoliMamp, então os valores propostos aqui já estão otimizados. Mude-os somente se você souber o que está fazendo.
+KeepDefaultValuesProxmox=Você usou o assistente de configuração Dolibarr de um dispositivo virtual Proxmox, portanto, os valores propostos aqui já estão otimizados. Mude-os somente se você souber o que está fazendo.
+UpgradeExternalModule=Execute o processo de atualização dedicado do módulo externo
 SetAtLeastOneOptionAsUrlParameter=Defina pelo menos uma opção como um parâmetro no URL. Por exemplo: '...repair.php?standard=confirmed'
 NothingToDelete=Nada para limpar/eliminar
 NothingToDo=Nada para fazer
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contrato correcção de dados
 MigrationContractsNumberToUpdate=%s contrato (s) para atualizar
 MigrationContractsLineCreation=Criar uma linha de contrato contrato ref %s
 MigrationContractsNothingToUpdate=Não há mais coisas para fazer
-MigrationContractsFieldDontExist=Campo fk_facture não existe mais. Nada a fazer.
+MigrationContractsFieldDontExist=O campo fk_facture não existe mais. Nada para fazer.
 MigrationContractsEmptyDatesUpdate=Contrato vazio data correcção
-MigrationContractsEmptyDatesUpdateSuccess=A correção de datas por preencher em contratos existentes foi efetuada com sucesso
+MigrationContractsEmptyDatesUpdateSuccess=Correção de data vazia do contrato feita com sucesso
 MigrationContractsEmptyDatesNothingToUpdate=Nenhum contrato vazio com data para corrigir
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nenhum contrato data de criação para corrigir
 MigrationContractsInvalidDatesUpdate=Data inválida, valor do contracto em correcção
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Actualização de entrega
 MigrationStockDetail=Atualizar stock valor dos produtos
 MigrationMenusDetail=Atualização dinâmica menus quadros
 MigrationDeliveryAddress=Atualizar endereço de entrega em transferências
-MigrationProjectTaskActors=Migração de dados para llx_projet_task_actors tabela
+MigrationProjectTaskActors=Migração de dados para a tabela llx_projet_task_actors
 MigrationProjectUserResp=Dados fk_user_resp domínio da migração de llx_projet para llx_element_contact
 MigrationProjectTaskTime=Atualização do tempo despendido em segundos
 MigrationActioncommElement=Atualizar os dados nas ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
-MigrationEvents=Migração dos eventos de forma a adicionar o criador do evento à tabela de atribuições
-MigrationEventsContact=Migração dos eventos de forma a adicionar o contacto do evento à tabela de atribuições
+MigrationEvents=Migração de eventos para adicionar o proprietário do evento à tabela de atribuições
+MigrationEventsContact=Migração de eventos para adicionar contato de evento à tabela de atribuições
 MigrationRemiseEntity=Atualize o valor do campo entity da tabela llx_societe_remise
 MigrationRemiseExceptEntity=Atualize o valor do campo entity da tabela llx_societe_remise_except
 MigrationUserRightsEntity=Atualizar o valor do campo entidade de llx_user_rights
 MigrationUserGroupRightsEntity=Atualizar o valor do campo entidade de llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Recarregar módulo %s
 MigrationResetBlockedLog=Restabelecer o módulo BlockedLog para o algoritmo v7
 ShowNotAvailableOptions=Mostrar opções indisponíveis
 HideNotAvailableOptions=Ocultar opções indisponíveis
-ErrorFoundDuringMigration=Não pode proceder ao próximo passo porque foram reportados erros durante o processo de migração. Para ignorar os erros, pode <a href="%s">clicar aqui</a>, mas a aplicação ou algumas funcionalidades desta poderão não funcionar corretamente.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ErrorFoundDuringMigration=Erro (s) foram relatados durante o processo de migração, portanto, a próxima etapa não está disponível. Para ignorar erros, você pode <a href="%s"> clicar aqui </a>, mas o aplicativo ou alguns recursos podem não funcionar corretamente até que os erros sejam resolvidos.
+YouTryInstallDisabledByDirLock=O aplicativo tentou fazer o upgrade automático, mas as páginas de instalação / atualização foram desativadas para segurança (o diretório foi renomeado com o sufixo .lock). <br>
+YouTryInstallDisabledByFileLock=O aplicativo tentou fazer o upgrade automático, mas as páginas de instalação / atualização foram desativadas para segurança (pela existência de um arquivo de bloqueio <strong> install.lock </ strong> no diretório de documentos dolibarr).
+ClickHereToGoToApp=Clique aqui para ir ao seu aplicativo
+ClickOnLinkOrRemoveManualy=Clique no link a seguir. Se você sempre vê esta mesma página, você deve remover / renomear o arquivo install.lock no diretório de documentos.
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index ee313b17aec..a8e01595cbf 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=Mailing
+Mailing=E-mailing
 EMailing=Mailing
 EMailings=Mailings
 AllEMailings=Todos os E-Mailings
@@ -21,7 +21,7 @@ MailFile=Ficheiro
 MailMessage=Mensagem do e-mail
 ShowEMailing=Mostrar E-Mailing
 ListOfEMailings=Lista de mailings
-NewMailing=Novo Mailing
+NewMailing=Novo emailing
 EditMailing=Editar Mailing
 ResetMailing=Reenviar e-mail
 DeleteMailing=Eliminar Mailing
@@ -43,15 +43,15 @@ MailUnsubcribe=Cancelar Subscrição
 MailingStatusNotContact=Não contactar
 MailingStatusReadAndUnsubscribe=Ler e cancelar subscrição
 ErrorMailRecipientIsEmpty=A direcção do destinatario está vazia
-WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatarios.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do?
-ConfirmDeleteMailing=Are you sure you want to delete this emailling?
-NbOfUniqueEMails=Nº de e-mails únicos
-NbOfEMails=Nº de E-mails
+WarningNoEMailsAdded=Nenhum e-mail novo para adicionar à lista destinatários.
+ConfirmValidMailing=Tem certeza de que deseja validar este e-mail?
+ConfirmResetMailing=Atenção, ao reinicializar o e-mail <b> %s </ b>, você poderá reenviar este e-mail em uma correspondência em massa. Você tem certeza de que quer fazer isso?
+ConfirmDeleteMailing=Tem certeza de que deseja excluir este e-mail?
+NbOfUniqueEMails=Não de e-mails exclusivos
+NbOfEMails=No. de EMails
 TotalNbOfDistinctRecipients=Número de destinatarios únicos
 NoTargetYet=Nenhum destinatario definido
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=Nenhum email de destinatário para %s
 RemoveRecipient=Eliminar destinatario
 YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de selecção e-mails, tem que ir a htdocs/core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=Em modo teste, as Variávels de substituição são sustituidas por valores genéricos
@@ -59,111 +59,111 @@ MailingAddFile=Adicionar este Ficheiro
 NoAttachedFiles=Sem ficheiros anexos
 BadEMail=Valor inválido para o email
 CloneEMailing=Clone Emailing
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+ConfirmCloneEMailing=Tem certeza de que deseja clonar este e-mail?
 CloneContent=Clone mensagem
 CloneReceivers=Clonar destinatários
-DateLastSend=Date of latest sending
+DateLastSend=Data do último envio
 DateSending=Data de envio
 SentTo=Enviado para <b>%s</b>
 MailingStatusRead=Ler
-YourMailUnsubcribeOK=O e-mail <b>%s</b> foi cancelado corretamente na lista de discusões
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
+YourMailUnsubcribeOK=O e-mail <b> %s </ b> está corretamente desinscrito da lista de discussão
+ActivateCheckReadKey=Chave usada para criptografar a URL usada para o recurso "Recibo de leitura" e "Cancelar inscrição"
 EMailSentToNRecipients=E-mail enviado para %s destinatários.
-EMailSentForNElements=EMail sent for %s elements.
-XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass EMail sending
-NbSelected=Nb selecionado
-NbIgnored=Nb ignorado
-NbSent=Nb enviado
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EMailSentForNElements=EMail enviado para elementos %s.
+XTargetsAdded=<b> %s </ b> destinatários adicionados à lista de segmentação
+OnlyPDFattachmentSupported=Se os documentos PDF já foram gerados para os objetos enviarem, eles serão anexados ao email. Caso contrário, nenhum email será enviado (note também que apenas documentos PDF são suportados como anexos no envio em massa nesta versão).
+AllRecipientSelected=Os destinatários do registro %s selecionado (se o e-mail for conhecido).
+GroupEmails=E-mails do grupo
+OneEmailPerRecipient=Um email por destinatário (por padrão, um email por registro selecionado)
+WarningIfYouCheckOneRecipientPerEmail=Atenção, se você marcar esta caixa, significa que apenas um e-mail será enviado para vários registros diferentes selecionados, portanto, se sua mensagem contiver variáveis ​​de substituição referentes a dados de um registro, não será possível substituí-las.
+ResultOfMailSending=Resultado do envio de email em massa
+NbSelected=Não selecionado
+NbIgnored=Não ignorado
+NbSent=Não enviado
+SentXXXmessages=%s mensagem (s) enviada (s).
+ConfirmUnvalidateEmailing=Tem certeza de que deseja alterar o e-mail <b> %s </ b> para o status do rascunho?
+MailingModuleDescContactsWithThirdpartyFilter=Contato com filtros de clientes
+MailingModuleDescContactsByCompanyCategory=Contatos por categoria de terceiros
+MailingModuleDescContactsByCategory=Contatos por categorias
+MailingModuleDescContactsByFunction=Contatos por posição
+MailingModuleDescEmailsFromFile=E-mails do arquivo
+MailingModuleDescEmailsFromUser=Entrada de e-mails pelo usuário
+MailingModuleDescDolibarrUsers=Usuários com e-mails
+MailingModuleDescThirdPartiesByCategories=Terceiros (por categorias)
+SendingFromWebInterfaceIsNotAllowed=Envio de interface web não é permitido.
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linha %s em Ficheiro
 RecipientSelectionModules=Módulos de selecção dos destinatarios
 MailSelectedRecipients=Destinatarios seleccionados
 MailingArea=Área mailings
-LastMailings=Latest %s emailings
+LastMailings=Últimos e-mails %s
 TargetsStatistics=Estatísticas destinatarios
 NbOfCompaniesContacts=Contactos únicos de empresas
 MailNoChangePossible=Destinatarios de um mailing validado não modificaveis
 SearchAMailing=Procurar um mailing
 SendMailing=Enviar mailing
 SentBy=Enviado por
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
-MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo nº de e-mails enviados por Sessão.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+MailingNeedCommand=O envio de um email pode ser executado a partir da linha de comando. Peça ao administrador do servidor para iniciar o seguinte comando para enviar o email para todos os destinatários:
+MailingNeedCommand2=Contudo, pode enviá-los on-line adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com o valor de número máximo de e-mails que pretende enviar por sessão. Para isto, vá para Início->Configuração->Outros.
+ConfirmSendingEmailing=Se você quiser enviar e-mails diretamente desta tela, confirme se deseja enviar e-mails a partir do seu navegador?
+LimitSendingEmailing=Nota: O envio de e-mails da interface da web é feito várias vezes por motivos de segurança e tempo de espera, <b> %s </ b> destinatários por vez para cada sessão de envio.
 TargetsReset=Limpar lista
 ToClearAllRecipientsClickHere=Para limpar a lista dos destinatarios deste mailing, faça click ao botão
 ToAddRecipientsChooseHere=Para Adicionar destinatarios, escoja os que figuran em listas a continuação
 NbOfEMailingsReceived=Mailings em masa recibidos
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Envios em massa enviados
 IdRecord=ID registo
 DeliveryReceipt=Recibo de entrega
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o carácter de separação <b>coma </b> para especificar multiplos destinatarios.
-TagCheckMail=Track mail opening
+TagCheckMail=Acompanhar a abertura de correio
 TagUnsubscribe=Endereço de cancelamento de subscrição
-TagSignature=Signature of sending user
+TagSignature=Assinatura do usuário de envio
 EMailRecipient=E-mail do destinatário
-TagMailtoEmail=Recipient EMail (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+TagMailtoEmail=E-mail de destinatário (incluindo o link "mailto:" html)
+NoEmailSentBadSenderOrRecipientEmail=Nenhum email enviado. Remetente incorreto ou email do destinatário. Verifique o perfil do usuário.
 # Module Notifications
 Notifications=Notificações
 NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa
 ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail
 SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
+AddNewNotification=Ativar um novo alvo/evento de notificação por e-mail
+ListOfActiveNotifications=Listar todos os destinos / eventos ativos para notificação por email
 ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailSendSetupIs=A configuração do envio de email foi configurada para '%s'. Este modo não pode ser usado para enviar e-mails em massa.
+MailSendSetupIs2=Você deve primeiro ir, com uma conta admin, no menu %sHome - Setup - EMails%s para alterar o parâmetro <strong> '%s' </ strong> para usar o modo '%s'. Com esse modo, você pode inserir a configuração do servidor SMTP fornecido pelo seu provedor de serviços de Internet e usar o recurso de envio de email em massa.
+MailSendSetupIs3=Se você tiver alguma dúvida sobre como configurar seu servidor SMTP, você pode perguntar para %s.
+YouCanAlsoUseSupervisorKeyword=Você também pode adicionar a palavra-chave <strong> __ SUPERVISOREMAIL __ </ strong> para que o email seja enviado ao supervisor do usuário (funciona somente se um email for definido para esse supervisor)
+NbOfTargetedContacts=Número atual de e-mails de contato segmentados
+UseFormatFileEmailToTarget=O arquivo importado deve ter formato <strong> email; nome; nome; outro </ strong>
+UseFormatInputEmailToTarget=Insira uma string com o formato <strong> email; nome; nome; outro </ strong>
 MailAdvTargetRecipients=Destinatários (seleção avançada)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtTitle=Preencha os campos de entrada para pré-selecionar os terceiros ou contatos / endereços para segmentar
+AdvTgtSearchTextHelp=Use %% como curingas. Por exemplo, para encontrar todos os itens como <b> jean, joe, jim </ b>, você pode inserir <b> j%% </ b>, você também pode usar; como separador por valor e use! por exceto este valor. Por exemplo, <b> jean; joe; jim%%;! Jimo;! Jima% </ b> terá como alvo todo o jean, joe, comece com jim mas não jimo e nem tudo que começar com jima
+AdvTgtSearchIntHelp=Use interval para selecionar int ou valor float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Utilizar intervalo para seleciona o valor da data
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AdvTgtStartDt=Comece com dt.
+AdvTgtEndDt=Fim dt.
+AdvTgtTypeOfIncudeHelp=E-mail de destino de terceiros e e-mail de contato do terceiro, ou apenas e-mail de terceiros ou apenas entre em contato com o e-mail
+AdvTgtTypeOfIncude=Tipo de email segmentado
+AdvTgtContactHelp=Use somente se você segmentar o contato para "Tipo de e-mail segmentado"
 AddAll=Adicionar tudo
 RemoveAll=Remover tudo
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criterias
+ItemsCount=Unid)
+AdvTgtNameTemplate=Nome do filtro
+AdvTgtAddContact=Adicione e-mails de acordo com os critérios
 AdvTgtLoadFilter=Carregar filtro
 AdvTgtDeleteFilter=Eliminar filtro
 AdvTgtSaveFilter=Guardar filtro
 AdvTgtCreateFilter=Criar filtro
 AdvTgtOrCreateNewFilter=Nome do novo filtro
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+NoContactWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
+NoContactLinkedToThirdpartieWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
+OutGoingEmailSetup=Configuração de email de saída
+InGoingEmailSetup=Configuração de email de entrada
+OutGoingEmailSetupForEmailing=Configuração de email de saída (para envio em massa)
+DefaultOutgoingEmailSetup=Configuração de email de saída padrão
 Information=Informação
-ContactsWithThirdpartyFilter=Contacts avec filtre client
+ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index d7a8f171d78..817d4dffca1 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contactos para este terceiro
 ContactsAddressesForCompany=Contactos/moradas para este terceiro
 AddressesForCompany=Moradas para este terceiro
 ActionsOnCompany=Eventos sobre este terceiro
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Eventos sobre este membro
 ActionsOnProduct=Eventos sobre este produto
 NActionsLate=%s em atraso
@@ -636,7 +637,7 @@ EMail=E-mail
 NoEMail=Sem e-mail
 Email=Email
 AlreadyRead=Alreay read
-NotRead=Not read
+NotRead=Não lido
 NoMobilePhone=Sem telefone móvel
 Owner=Proprietário
 FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
@@ -847,9 +848,9 @@ ModuleBuilder=Construtor de módulos
 SetMultiCurrencyCode=Definir moeda
 BulkActions=Ações em massa
 ClickToShowHelp=Clique para mostrar o balão de ajuda
-WebSite=Site da Web
-WebSites=Websites
-WebSiteAccounts=Contas do website
+WebSite=Website
+WebSites=Sites da Web
+WebSiteAccounts=Website accounts
 ExpenseReport=Relatório de despesas
 ExpenseReports=Relatórios de despesas
 HR=RH
@@ -931,7 +932,7 @@ SearchIntoInterventions=Intervenções
 SearchIntoContracts=contractos
 SearchIntoCustomerShipments=Expedições do cliente
 SearchIntoExpenseReports=Relatórios de despesas
-SearchIntoLeaves=Leave
+SearchIntoLeaves=Sair
 CommentLink=Comentários
 NbComments=Número de comentários
 CommentPage=Espaço de comentários
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Ficheiro partilhado via link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
+Inventory=Inventário
diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
index a5b2391c681..78c13ebbe04 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -6,12 +6,12 @@ TotalMargin=Margem total
 MarginOnProducts=Margem / Produtos
 MarginOnServices=Margem / Serviços
 MarginRate=Taxa de margem
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
+MarkRate=Taxa de marca
+DisplayMarginRates=Exibir taxas de margem
+DisplayMarkRates=Exibir taxas de marca
 InputPrice=Inserir preço
-margin=Profit margins management
-margesSetup=Profit margins management setup
+margin=Gestão de margens de lucro
+margesSetup=Configuração de gerenciamento de margens de lucro
 MarginDetails=Detalhes da margem
 ProductMargins=Margens do produto
 CustomerMargins=Margens do cliente
@@ -20,25 +20,25 @@ UserMargins=Margens do utilizador
 ProductService=Produto ou Serviço
 AllProducts=Todos os produtos e serviços
 ChooseProduct/Service=Escolher produto ou serviço
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNull=Forçar compra / preço de custo ao preço de venda, se não definido
+ForceBuyingPriceIfNullDetails=Se compra / preço de custo não definido, e esta opção "ON", a margem será zero on line (compra / preço de custo = preço de venda), caso contrário ("OFF"), a margem será igual ao padrão sugerido.
 MARGIN_METHODE_FOR_DISCOUNT=Método de margem para descontos globais
 UseDiscountAsProduct=Como um produto
 UseDiscountAsService=Como um serviço
 UseDiscountOnTotal=No subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global é tratado como um produto, um serviço, ou apenas no subtotal para cálculo de margem
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
+MARGIN_TYPE=Preço de compra / custo sugerido por padrão para cálculo de margem
+MargeType1=Margem no melhor preço do fornecedor
+MargeType2=Margem no Preço Médio Ponderado (WAP)
 MargeType3=Margem no Preço de Custo
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margem sobre o melhor preço de compra = Preço de venda - Melhor preço de fornecedor definido no cartão do produto <br> * Margem no preço médio ponderado (WAP) = Preço de venda - Preço médio ponderado pelo produto (WAP) ou melhor preço do fornecedor se WAP ainda não definido br> * Margem no preço de custo = Preço de venda - Preço de custo definido no cartão do produto ou WAP se o preço de custo não estiver definido, ou melhor preço do fornecedor se o WAP ainda não estiver definido
 CostPrice=Preço de custo
 UnitCharges=Custos unitários
 Charges=Custos
 AgentContactType=Tipo de contacto usado para comissionamento
 AgentContactTypeDetails=Defina que tipo de contacto (associado em faturas) será usado no relatório de margens, por representante de vendas
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+rateMustBeNumeric=A taxa deve ser um valor numérico
+markRateShouldBeLesserThan100=A taxa de marca deve ser menor que 100
+ShowMarginInfos=Mostrar informações da margem
+CheckMargins=Detalhe de margens
+MarginPerSaleRepresentativeWarning=O relatório de margem por usuário usa o link entre terceiros e representantes de vendas para calcular a margem de cada representante de vendas. Como alguns terceiros podem não ter qualquer representante de vendas dedicado e alguns terceiros podem estar vinculados a vários, alguns valores podem não ser incluídos neste relatório (se não houver representante de vendas) e alguns podem aparecer em linhas diferentes (para cada representante de vendas) .
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index f846103c137..508e869f72a 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -56,10 +56,10 @@ PaymentSubscription=Nova contribuição pagamento
 SubscriptionEndDate=Data fim filiação
 MembersTypeSetup=configuração dos tipos de Membros
 MemberTypeModified=Tipo de membro modificado
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+DeleteAMemberType=Excluir um tipo de membro
+ConfirmDeleteMemberType=Tem certeza de que deseja excluir este tipo de membro?
+MemberTypeDeleted=Tipo de membro excluído
+MemberTypeCanNotBeDeleted=O tipo de membro não pode ser excluído
 NewSubscription=Nova filiação
 NewSubscriptionDesc=Este formulário permite-lhe gravar sua inscrição como um novo membro da fundação. Se você deseja renovar a sua assinatura (se já for membro), entre em contato com Conselho da Fundação vez por %s e-mail.
 Subscription=Filiação
@@ -68,7 +68,7 @@ SubscriptionLate=Em atraso
 SubscriptionNotReceived=Filiação não recebida
 ListOfSubscriptions=Lista de Filicações
 SendCardByMail=Enviar ficha por email
-AddMember=Create member
+AddMember=Criar membro
 NoTypeDefinedGoToSetup=Nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 NewMemberType=Novo tipo de membro
 WelcomeEMail=E-mail
@@ -79,21 +79,21 @@ Physical=Pessoa Singular
 Moral=Pessoa Coletiva
 MorPhy=Pessoa Singular/Pessoa Coletiva
 Reenable=Reactivar
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
+ResiliateMember=Terminar um membro
+ConfirmResiliateMember=Tem certeza de que deseja encerrar este membro?
 DeleteMember=Eliminar um membro
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ConfirmDeleteMember=Tem certeza de que deseja excluir este membro (Excluir um membro excluirá todas as inscrições dele)?
 DeleteSubscription=Eliminar uma filiação
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=Tem certeza de que deseja excluir esta assinatura?
 Filehtpasswd=Ficheiro htpasswd
 ValidateMember=Confirmar um membro
 ConfirmValidateMember=Tem a certeza que deseja validar este membro?
-FollowingLinksArePublic=Os vínculos seguintes são páginas acessiveis a todos e não protegidas por Nenhuma habilitação Dolibarr.
+FollowingLinksArePublic=Os links a seguir são páginas abertas não protegidas por nenhuma permissão do Dolibarr. Eles não são páginas formatadas, fornecidas como exemplo para mostrar como listar banco de dados de membros.
 PublicMemberList=Lista pública de Membros
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
+BlankSubscriptionForm=Formulário de inscrição própria pública
+BlankSubscriptionFormDesc=O Dolibarr pode fornecer a você um URL / site público para permitir que visitantes externos peçam para assinar a fundação. Se um módulo de pagamento on-line estiver ativado, um formulário de pagamento também poderá ser fornecido automaticamente.
+EnablePublicSubscriptionForm=Ativar o site público com formulário de inscrição própria
+ForceMemberType=Forçar o tipo de membro
 ExportDataset_member_1=Membros e Filicações
 ImportDataset_member_1=Membros
 LastMembersModified=Últimos %smembros modificados
@@ -103,36 +103,36 @@ Text=Texto largo
 Int=Numérico
 DateAndTime=data e hora
 PublicMemberCard=Ficha pública do membro
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
+SubscriptionNotRecorded=Assinatura não registrada
+AddSubscription=Criar assinatura
 ShowSubscription=Mostrar filiação
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Envio de email informativo para o membro
+SendingEmailOnAutoSubscription=Envio de email no registro automático
+SendingEmailOnMemberValidation=Enviando email na validação de novo membro
+SendingEmailOnNewSubscription=Enviando email na nova assinatura
+SendingReminderForExpiredSubscription=Enviando lembrete para inscrições expiradas
+SendingEmailOnCancelation=Envio de email no cancelamento
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=Sua associação foi recebida.
+YourMembershipWasValidated=Sua associação foi validada
+YourSubscriptionWasRecorded=Sua nova assinatura foi registrada
+SubscriptionReminderEmail=Lembrete de assinatura
+YourMembershipWasCanceled=Sua associação foi cancelada
 CardContent=Conteúdo do seu cartão de membro
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos que você saiba que sua solicitação de adesão foi recebida. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Queremos informar que sua associação foi validada com as seguintes informações: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos informar que sua nova assinatura foi registrada. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Gostaríamos de informar que sua assinatura está prestes a expirar ou já expirou (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que você possa renová-lo. <br> <br>
+ThisIsContentOfYourCard=Este é um lembrete das informações que recebemos sobre você. Sinta-se à vontade para nos contatar se algo parecer errado. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail recebido em caso de auto-inscrição de um convidado
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recebido em caso de auto-inscrição de um convidado
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-mail de modelo a ser usado para enviar e-mail para um membro da autosubscrição de membro
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modelo EMail para usar para enviar email para um membro na validação de membro
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modelo de e-mail para usar para enviar e-mail para um membro em nova gravação de assinatura
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=O modelo de e-mail a ser usado para enviar e-mails é lembrado quando a assinatura está prestes a expirar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modelo de e-mail para usar para enviar e-mail para um membro no cancelamento de membro
 DescADHERENT_MAIL_FROM=E-mail emissor para os e-mails automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impresso na folhas de endereços dos membros
@@ -147,8 +147,8 @@ NoThirdPartyAssociatedToMember=nenhum Terceiro asociado a este membro
 MembersAndSubscriptions= Deputados e Subscriptions
 MoreActions=Complementares de acção sobre a gravação
 MoreActionsOnSubscription=Ação complementar, sugerido por defeito durante a gravação de uma assinatura
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Criar uma entrada direta na conta bancária
+MoreActionBankViaInvoice=Crie uma fatura e um pagamento na conta bancária
 MoreActionInvoiceOnly=Criar uma fatura sem pagamento
 LinkToGeneratedPages=Gerar cartões de visita
 LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com os cartões de negócio para todos os seus membros ou de um membro particular.
@@ -169,7 +169,7 @@ MembersByStateDesc=Esta tela mostrar-lhe as estatísticas sobre os membros por e
 MembersByTownDesc=Esta tela mostrará estatísticas sobre membros por localidade.
 MembersStatisticsDesc=Escolha as estatísticas que você deseja ler ...
 MenuMembersStats=Estatística
-LastMemberDate=Latest member date
+LastMemberDate=Última data do membro
 LatestSubscriptionDate=Data da última subscrição
 Nature=Natureza
 Public=As informações são públicas
@@ -182,17 +182,16 @@ TurnoverOrBudget=Volume de negócios (para uma empresa) ou do Orçamento (para u
 DefaultAmount=Quantidade padrão de assinatura
 CanEditAmount=Visitante pode escolher / editar montante da sua subscrição
 MEMBER_NEWFORM_PAYONLINE=Ir a página de pagamento online integrado
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
+ByProperties=Por natureza
+MembersStatisticsByProperties=Estatísticas dos membros por natureza
+MembersByNature=Esta tela mostra estatísticas sobre membros por natureza.
+MembersByRegion=Esta tela mostra estatísticas sobre membros por região.
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
 NoVatOnSubscription=Sem TVA para assinaturas
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto utilizado para assinatura na fatura: %s
+NameOrCompany=Nome ou empresa
+SubscriptionRecorded=Assinatura registrada
+NoEmailSentToMember=Nenhum email enviado para o membro
+EmailSentToMember=E-mail enviado para o membro em %s
+SendReminderForExpiredSubscriptionTitle=Enviar lembrete por email para assinatura expirada
+SendReminderForExpiredSubscription=Enviar lembrete por e-mail aos membros quando a assinatura estiver prestes a expirar (o parâmetro é o número de dias antes do final da assinatura para enviar o lembrete. Pode ser uma lista de dias separados por ponto e vírgula, por exemplo, '10; 5; 0; -5 ')
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 990426d59eb..7af2dcbba1d 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -1,101 +1,102 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Esta ferramenta deve ser utilizada por utilizadores mais experientes ou programadores. Esta oferece utilitários para criar ou editar o seu próprio módulo (A documentação para o desenvolvimento manual alternativo encontra-se <a href="%s" target="_blank">aqui</a>).
+ModuleBuilderDesc=Esta ferramenta deve ser usada apenas por usuários experientes ou desenvolvedores. Ele oferece utilitários para criar ou editar seu próprio módulo. <br> Documentação para alternativas <a href="%s" target="_blank"> desenvolvimento manual está aqui </a>.
 EnterNameOfModuleDesc=Introduza o nome do módulo/aplicação a criar, sem espaços. Use maiúsculas para separar palavras (Por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+EnterNameOfObjectDesc=Digite o nome do objeto para criar sem espaços. Use letras maiúsculas para separar palavras (por exemplo: MyObject, Student, Teacher ...). O arquivo de classe CRUD, mas também o arquivo da API, serão geradas páginas para listar / adicionar / editar / excluir objetos e arquivos SQL.
 ModuleBuilderDesc2=Caminho onde são gerados/editados os módulos (primeira diretoria alternativa definida em %s): <strong>%s</strong>
 ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+ModuleBuilderDesc4=Um módulo é detectado como 'editável' quando o arquivo <strong> %s </ strong> existe na raiz do diretório do módulo
 NewModule=Novo módulo
 NewObject=Novo objeto
 ModuleKey=Chave do módulo
 ObjectKey=Chave do objeto
 ModuleInitialized=Módulo inicializado
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a long text to describe the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+FilesForObjectInitialized=Arquivos para o novo objeto '%s' inicializado
+FilesForObjectUpdated=Arquivos para o objeto '%s' atualizado (arquivos .sql e arquivo .class.php)
+ModuleBuilderDescdescription=Digite aqui todas as informações gerais que descrevem seu módulo.
+ModuleBuilderDescspecifications=Você pode inserir aqui uma descrição detalhada das especificações do seu módulo que ainda não está estruturada em outras guias. Então você tem fácil acesso a todas as regras para desenvolver. Além disso, este conteúdo de texto será incluído na documentação gerada (consulte a última guia). Você pode usar o formato Markdown, mas é recomendável usar o formato Asciidoc (comparação entre .md e .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Defina aqui os objetos que você deseja gerenciar com seu módulo. Uma classe CRUD DAO, arquivos SQL, página para listar registro de objetos, para criar / editar / visualizar um registro e uma API será gerada.
 ModuleBuilderDescmenus=Este separador é dedicado para definir entradas de menu fornecidas pelo seu módulo.
 ModuleBuilderDescpermissions=Este separador é dedicado para definir as novas permissões que deseja fornecer com o seu módulo.
 ModuleBuilderDesctriggers=Esta é a vista dos acionadores fornecidos pelo seu módulo. Para incluir o código executado quando um evento comercial acionado é iniciado, basta editar este ficheiro.
 ModuleBuilderDeschooks=Este separador é dedicado para hooks.
 ModuleBuilderDescwidgets=Este separador é dedicado para gerir/criar widgets.
 ModuleBuilderDescbuildpackage=Você pode gerar aqui um ficheiro pacote "pronto para distribuir" (um ficheiro .zip normalizado) do seu módulo e um ficheiro de documentação "pronto para distribuir". Basta clicar no botão para criar o ficheiro pacote do módulo e o ficheiro de documentação.
-EnterNameOfModuleToDeleteDesc=Você pode eliminar o seu módulo. AVISO: Todos os ficheiros associados ao módulo, dados estruturados e documentação serão apagados definitivamente!
-EnterNameOfObjectToDeleteDesc=Você pode eliminar um objeto. AVISO: Todos os arquivos relacionados com o objeto serão apagados definitivamente!
+EnterNameOfModuleToDeleteDesc=Você pode excluir seu módulo. AVISO: TODOS os arquivos de dados e documentação do módulo E estruturados serão excluídos!
+EnterNameOfObjectToDeleteDesc=Você pode excluir um objeto. AVISO: Todos os arquivos relacionados ao objeto serão excluídos!
 DangerZone=Zona de perigo
 BuildPackage=Criar pacote/documentação
 BuildDocumentation=Criar documentação
-ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here:
+ModuleIsNotActive=Este módulo não está ativado ainda. Vá até %s para fazê-lo funcionar ou clique aqui:
 ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode causar problemas numa característica ativa atual.
 DescriptionLong=Descrição longa
 EditorName=Nome do editor
 EditorUrl=URL do editor
 DescriptorFile=Ficheiro descritor do módulo
-ClassFile=File for PHP DAO CRUD class
+ClassFile=Arquivo para PHP classe DAO CRUD
 ApiClassFile=Ficheiro para a classe API PHP
 PageForList=Página PHP para a lista de registos
 PageForCreateEditView=Página PHP para criar/editar/visualizar um registo
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
+PageForAgendaTab=Página PHP para guia de evento
+PageForDocumentTab=Página PHP para guia do documento
+PageForNoteTab=Página do PHP para a guia de nota
 PathToModulePackage=Caminho para o ficheiro pacote .zip do módulo/aplicação
 PathToModuleDocumentation=Caminho para o ficheiro de documentação do módulo/aplicação
 SpaceOrSpecialCharAreNotAllowed=Espaços ou caracteres especiais não são permitidos.
 FileNotYetGenerated=O ficheiro ainda não foi gerado
-RegenerateClassAndSql=Erase and regenerate class and sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File with business rules
-LanguageFile=File for language
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for PHP libraries
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=Go to API explorer
-ListOfMenusEntries=List of menu entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list ? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool ? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu. Warning: This is a developer feature, bad use may breaks your application.
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disallow the about page
-UseDocFolder=Disallow the documentation folder
-UseSpecificReadme=Use a specific ReadMe
+RegenerateClassAndSql=Apagar e regenerar arquivos de classe e sql
+RegenerateMissingFiles=Gere arquivos ausentes
+SpecificationFile=Arquivar com regras de negócios
+LanguageFile=Arquivar por idioma
+ConfirmDeleteProperty=Tem certeza de que deseja excluir a propriedade <strong> %s </ strong>? Isso irá mudar o código na classe PHP, mas também removerá a coluna da definição da tabela do objeto.
+NotNull=Não nulo
+NotNullDesc=1 = Definir banco de dados para NOT NULL. -1 = Permitir valores nulos e forçar valor para NULL se vazio ('' ou 0).
+SearchAll=Usado para "pesquisar todos"
+DatabaseIndex=Índex da Base de Dados
+FileAlreadyExists=O arquivo %s já existe
+TriggersFile=Arquivo para o código de gatilhos
+HooksFile=Arquivo para o código de ganchos
+ArrayOfKeyValues=Matriz de chave-val
+ArrayOfKeyValuesDesc=Matriz de chaves e valores se o campo for uma lista de combinação com valores fixos
+WidgetFile=Arquivo Widget
+ReadmeFile=Arquivo Leiame
+ChangeLog=Arquivo ChangeLog
+TestClassFile=Arquivo para a classe de teste de unidade do PHP
+SqlFile=Arquivo Sql
+PageForLib=Arquivo para bibliotecas PHP
+SqlFileExtraFields=Arquivo Sql para atributos complementares
+SqlFileKey=Arquivo Sql para chaves
+AnObjectAlreadyExistWithThisNameAndDiffCase=Um objeto já existe com este nome e um caso diferente
+UseAsciiDocFormat=Você pode usar o formato Markdown, mas é recomendável usar o formato Asciidoc (omparison entre .md e .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=É uma medida
+DirScanned=Diretório varrido
+NoTrigger=Nenhum gatilho
+NoWidget=Nenhum widget
+GoToApiExplorer=Ir para o explorador de API
+ListOfMenusEntries=Lista de entradas do menu
+ListOfPermissionsDefined=Lista de permissões definidas
+SeeExamples=Veja exemplos aqui
+EnabledDesc=Condição para ter este campo ativo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=O campo está visível? (Exemplos: 0 = Nunca visível, 1 = Visível na lista e criar / atualizar / visualizar formulários, 2 = Visível apenas na lista, 3 = Visível somente no formulário criar / atualizar / visualizar. Usar um valor negativo significa que o campo não é mostrado por padrão na lista, mas pode ser selecionado para visualização)
+IsAMeasureDesc=O valor do campo pode ser acumulado para obter um total na lista? (Exemplos: 1 ou 0)
+SearchAllDesc=O campo é usado para fazer uma pesquisa a partir da ferramenta de pesquisa rápida? (Exemplos: 1 ou 0)
+SpecDefDesc=Digite aqui toda a documentação que você deseja fornecer com seu módulo que ainda não está definido por outras guias. Você pode usar .md ou melhor, a rica sintaxe .asciidoc.
+LanguageDefDesc=Entre neste arquivo, toda a chave e a tradução para cada arquivo de idioma.
+MenusDefDesc=Defina aqui os menus fornecidos pelo seu módulo (uma vez definidos, eles são visíveis no editor de menu %s)
+PermissionsDefDesc=Defina aqui as novas permissões fornecidas pelo seu módulo (uma vez definidas, elas são visíveis na configuração de permissões padrão %s)
+HooksDefDesc=Defina na propriedade <b> module_parts ['hooks'] </ b>, no descritor de módulo, o contexto dos ganchos que você deseja gerenciar (lista de contextos pode ser encontrada por uma pesquisa em '<b> initHooks (</ b> 'in core code). <br> Edite o arquivo hook para adicionar código de suas funções (funções hookable podem ser encontradas por uma pesquisa em' <b> executeHooks </ b> 'no código principal).
+TriggerDefDesc=Defina no arquivo acionador o código que você deseja executar para cada evento de negócios executado.
+SeeIDsInUse=Veja os códigos em uso na sua instalação
+SeeReservedIDsRangeHere=Veja o intervalo de IDs reservados
+ToolkitForDevelopers=Toolkit para desenvolvedores do Dolibarr
+TryToUseTheModuleBuilder=Se você tem conhecimento de SQL e PHP, você pode usar o assistente do construtor de módulo nativo. <br> Habilite o módulo <strong> %s </ strong> e use o assistente clicando no <span class = "fa-bug"> </ span> no menu superior direito. <br> Aviso: este é um recurso de desenvolvedor avançado, não <b> experimente </ b> em seu site de produção!
+SeeTopRightMenu=Veja <span class = "fa fa-bug"> </ span> no menu superior direito
+AddLanguageFile=Adicionar ficheiro de idiomas
+YouCanUseTranslationKey=Você pode usar aqui uma chave que é a chave de tradução encontrada no arquivo de idioma (veja a aba "Idiomas")
+DropTableIfEmpty=(Excluir tabela se vazia)
+TableDoesNotExists=A tabela %s não existe
+TableDropped=Tabela %s excluída
+InitStructureFromExistingTable=Construir a cadeia de matriz de estrutura de uma tabela existente
+UseAboutPage=Desativar a página sobre
+UseDocFolder=Desativar a pasta de documentação
+UseSpecificReadme=Use um ReadMe específico
+RealPathOfModule=Caminho real do módulo
diff --git a/htdocs/langs/pt_PT/opensurvey.lang b/htdocs/langs/pt_PT/opensurvey.lang
index 11d99b98390..06159ebc70a 100644
--- a/htdocs/langs/pt_PT/opensurvey.lang
+++ b/htdocs/langs/pt_PT/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Título da Votação
 ToReceiveEMailForEachVote=Receber um email por cada voto
 TypeDate=Tipo de data
 TypeClassic=Tipo padrão
-OpenSurveyStep2=Selecione as suas datas entre os dias grátis (cinza). Os dias selecionados são verdes. Você pode desmarcar um dia selecionado anteriormente clicando novamente nele.
+OpenSurveyStep2=Selecione suas datas entre os dias livres (cinza). Os dias selecionados são verdes. Você pode desmarcar um dia selecionado anteriormente, clicando novamente nele
 RemoveAllDays=Remover todos os dias
 CopyHoursOfFirstDay=Copiar horas do primeiro dia
 RemoveAllHours=Remover todas as horas
@@ -35,9 +35,9 @@ TitleChoice=Etiqueta de escolha
 ExportSpreadsheet=Exportar resultados para uma folha de cálculo
 ExpireDate=Data Limite
 NbOfSurveys=Número de inquéritos
-NbOfVoters=N.º de Eleitores
+NbOfVoters=Número de eleitores
 SurveyResults=Resultados
-PollAdminDesc=Você tem permissão para alterar todas as linhas de votação deste inquérito com o botão "Editar". Você pode também remover uma coluna ou uma linha com %s. E pode adicionar uma nova coluna com %s.
+PollAdminDesc=Está autorizado a alterar todas as linhas de votação deste inquérito com o botão "Editar". Também pode remover uma coluna ou uma linha com %s. E também pode adicionar uma nova coluna com %s.
 5MoreChoices=Mais 5 opções
 Against=Contra
 YouAreInivitedToVote=Foi convidado a votar nesta votação
@@ -58,4 +58,4 @@ MoreChoices=Insira mais escolhas para os inquiridos
 SurveyExpiredInfo=O inquérito foi encerrado ou o prazo de votação expirou.
 EmailSomeoneVoted=%s preencheu uma linha.\nVocê pode encontrar o seu inquérito através da hiperligação:\n%s
 ShowSurvey=Mostrar estudo
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+UserMustBeSameThanUserUsedToVote=Você deve ter votado e usar o mesmo nome de usuário que aquele usado para votar, para postar um comentário
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 19e25095a6c..742f34e0abc 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -3,7 +3,7 @@ SecurityCode=Código de segurança
 NumberingShort=N°
 Tools=Utilidades
 TMenuTools=Ferramentas
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+ToolsDesc=Todas as ferramentas não incluídas em outras entradas do menu estão agrupadas aqui. Todas as ferramentas podem ser acessadas através do menu à esquerda.
 Birthday=Aniversario
 BirthdayDate=Data de nascimento
 DateToBirth=Data de Nascimento
@@ -23,7 +23,7 @@ MessageForm=Mensagem no formulário de pagamento online
 MessageOK=Mensagem na página validado o pagamento de retorno
 MessageKO=Mensagem na página de pagamento cancelado retorno
 ContentOfDirectoryIsNotEmpty=O diretório não está vazio.
-DeleteAlsoContentRecursively=Check to delete all content recursively
+DeleteAlsoContentRecursively=Marque para excluir todo o conteúdo recursivamente
 
 YearOfInvoice=Ano da data da fatura
 PreviousYearOfInvoice=Ano anterior à data da fatura
@@ -38,8 +38,8 @@ Notify_ORDER_SUPPLIER_VALIDATE=Encomenda a fornecedor registada
 Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado
 Notify_PROPAL_VALIDATE=Orçamento validado
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Proposta do cliente fechada assinada
+Notify_PROPAL_CLOSE_REFUSED=Proposta do cliente fechada recusada
 Notify_PROPAL_SENTBYMAIL=Orçamento enviado por correio
 Notify_WITHDRAW_TRANSMIT=Retirada de transmissão
 Notify_WITHDRAW_CREDIT=Retirada de crédito
@@ -48,11 +48,11 @@ Notify_COMPANY_CREATE=Terceiro criado
 Notify_COMPANY_SENTBYMAIL=Emails enviadas a partir da ficha de terceiros
 Notify_BILL_VALIDATE=Fatura do cliente validada
 Notify_BILL_UNVALIDATE=Fatura do cliente não validada
-Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_PAYED=Fatura do cliente paga
 Notify_BILL_CANCEL=Fatura do cliente cancelada
 Notify_BILL_SENTBYMAIL=Fatura do cliente enviada pelo correio
 Notify_BILL_SUPPLIER_VALIDATE=Fatura do fornecedor validado
-Notify_BILL_SUPPLIER_PAYED=Supplier invoice paid
+Notify_BILL_SUPPLIER_PAYED=Fatura do fornecedor paga
 Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura do fornecedor enviada por correio
 Notify_BILL_SUPPLIER_CANCELED=Fatura do fornecedor cancelada
 Notify_CONTRACT_VALIDATE=Contrato validado
@@ -70,31 +70,32 @@ Notify_PROJECT_CREATE=Criação do projeto
 Notify_TASK_CREATE=Tarefa criada
 Notify_TASK_MODIFY=Tarefa modificada
 Notify_TASK_DELETE=Tarefa eliminada
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_EXPENSE_REPORT_VALIDATE=Relatório de despesas validado (aprovação obrigatória)
+Notify_EXPENSE_REPORT_APPROVE=Relatório de despesas aprovado
+Notify_HOLIDAY_VALIDATE=Deixe o pedido validado (aprovação obrigatória)
+Notify_HOLIDAY_APPROVE=Deixe o pedido aprovado
 SeeModuleSetup=Veja a configuração do módulo %s
 NbOfAttachedFiles=Número Ficheiros/Documentos anexos
 TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos
 MaxSize=Tamanho Máximo
 AttachANewFile=Adicionar um novo documento/ficheiro
 LinkedObject=Objecto adjudicado
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find attached price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find attached order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find attached our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find attached shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find attached intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+NbOfActiveNotifications=Número de notificações (nº de emails de destinatários)
+PredefinedMailTest=__(Olá)__\nEste é um email de teste enviado para __EMAIL__.\nAs duas linhas são separadas por um retorno de carro.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Olá)__\nEste é um teste <b> mail </ b> (a palavra teste deve estar em negrito). <br> As duas linhas são separadas por um retorno de carro. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Olá)__\n\nPor favor, encontre a fatura em anexo __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Olá)__\n\nGostaríamos de avisá-lo que a fatura __REF__ parece não ter sido paga. A fatura é anexada, como um lembrete.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Olá)__\n\nPor favor, encontre a proposta comercial anexa __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Olá)__\n\nPor favor, encontrar o pedido de preço em anexo __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Olá)__\n\nPor favor, encontre a ordem em anexo __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Olá)__\n\nPor favor, encontre o nosso pedido em anexo __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Olá)__\n\nPor favor, encontre a fatura em anexo __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Olá)__\n\nPor favor, encontrar o envio em anexo __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Olá)__\n\nPor favor encontre a intervenção em anexo __REF__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Você pode clicar no link abaixo para fazer seu pagamento, se ainda não estiver pronto.\n\n%s\n\n
 DemoDesc=O Dolibarr é um ERP/CRM compacto que suporta vários módulos de negócios. Uma demonstração mostrando todos os módulos não faz sentido porque esse cenário nunca ocorre (várias centenas disponíveis). Assim, vários perfis de demonstração estão disponíveis.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se adequa às suas necessidades ...
 ChooseYourDemoProfilMore=...ou crie o seu próprio perfil <br> (seleção manual de módulo)
@@ -175,7 +176,7 @@ EnableGDLibraryDesc=Instale ou ative a biblioteca GD na instalação do PHP para
 ProfIdShortDesc=<b>ID Prof. %s</b> é uma informação dependente do país do Terceiro.<br>Por Exemplo, para o país  <b>%s</b>, é o código <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByNumberOfUnits=Estatísticas para o somatório da quantidade de produtos/serviços
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Estatísticas em número de entidades de referência (nº de fatura ou ordem ...)
 NumberOfProposals=Número de orçamentos
 NumberOfCustomerOrders=Número de encomendas de clientes
 NumberOfCustomerInvoices=Número de faturas a clientes
@@ -188,10 +189,10 @@ NumberOfUnitsCustomerInvoices=Número de unidades em faturas a clientes
 NumberOfUnitsSupplierProposals=Número de unidades nos orçamentos de fornecedor
 NumberOfUnitsSupplierOrders=Número de unidades em encomendas a fornecedores
 NumberOfUnitsSupplierInvoices=Número de unidades nas faturas de fornecedores
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionAddedContact=Uma nova intervenção %s foi atribuída a você.
 EMailTextInterventionValidated=Intervenção %s validados
 EMailTextInvoiceValidated=A fatura %s foi validada.
-EMailTextInvoicePayed=The invoice %s has been paid.
+EMailTextInvoicePayed=A fatura %s foi paga.
 EMailTextProposalValidated=O orçamento %s foi validado.
 EMailTextProposalClosedSigned=O orçamento %s foi fechado e assinado.
 EMailTextOrderValidated=O %s pedido foi validado.
@@ -201,10 +202,10 @@ EMailTextOrderApprovedBy=Pedido %s Aprovado por %s
 EMailTextOrderRefused=Pedido %s Reprovado
 EMailTextOrderRefusedBy=Pedido %s Reprovado por %s
 EMailTextExpeditionValidated=O envio %s foi validado.
-EMailTextExpenseReportValidated=The expense report %s has been validated.
-EMailTextExpenseReportApproved=The expensereport %s has been approved.
-EMailTextHolidayValidated=The leave request %s has been validated.
-EMailTextHolidayApproved=The leave request %s has been approved.
+EMailTextExpenseReportValidated=O relatório de despesas %s foi validado.
+EMailTextExpenseReportApproved=O expensereport %s foi aprovado.
+EMailTextHolidayValidated=O pedido de licença %s foi validado.
+EMailTextHolidayApproved=O pedido de licença %s foi aprovado.
 ImportedWithSet=Importação conjunto de dados
 DolibarrNotification=Notificação automática
 ResizeDesc=Insira a nova largura <b>OU</b> altura. A proporção será mantida durante o redimensionamento...
@@ -212,7 +213,7 @@ NewLength=Nova largura
 NewHeight=Nova altura
 NewSizeAfterCropping=Novo tamanho depois de recortar
 DefineNewAreaToPick=Definir nova área na imagem para escolher (clique esquerdo na imagem e depois arraste até chegar ao canto oposto)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+CurrentInformationOnImage=Esta ferramenta foi projetada para ajudá-lo a redimensionar ou cortar uma imagem. Esta é a informação sobre a imagem editada atual
 ImageEditor=editor de imagem
 YouReceiveMailBecauseOfNotification=Você recebe essa mensagem porque seu e-mail foi adicionado à lista de metas a serem informados de eventos particulares no software %s %s de.
 YouReceiveMailBecauseOfNotification2=Este evento é o seguinte:
@@ -227,9 +228,9 @@ FileIsTooBig=Arquivos muito grandes
 PleaseBePatient=Por favor, aguarde...
 NewPassword=Nova palavra-passe
 ResetPassword=Repor palavra-passe
-RequestToResetPasswordReceived=A request to change your password has been received.
+RequestToResetPasswordReceived=Um pedido para alterar sua senha foi recebido.
 NewKeyIs=Estas são as suas novas credenciais para efectuar login
-NewKeyWillBe=Your new key to login to software will be
+NewKeyWillBe=Sua nova chave para acessar o software será
 ClickHereToGoTo=Clique aqui para ir para %s
 YouMustClickToChange=No entanto, você deve primeiro clicar no seguinte link para validar esta alteração de palavra-passe
 ForgetIfNothing=Se você não solicitou esta alteração, ignore o e-mail. As suas credenciais serão mantidas em segurança.
@@ -242,11 +243,11 @@ PermissionsDelete=Permissões removidas
 YourPasswordMustHaveAtLeastXChars=A sua palavra-passe deve ter pelo menos estes caracteres: <strong>%s</strong>
 YourPasswordHasBeenReset=A sua palavra-passe foi reposta com sucesso
 ApplicantIpAddress=Endereço IP do requerente
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email ID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email ID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email ID %s
+SMSSentTo=SMS enviado para %s
+MissingIds=IDs ausentes
+ThirdPartyCreatedByEmailCollector=Terceiro criado pelo coletor de e-mail a partir do ID de email %s
+ContactCreatedByEmailCollector=Contato / endereço criado pelo coletor de e-mail a partir do e-mail ID %s
+ProjectCreatedByEmailCollector=Projeto criado pelo coletor de e-mail a partir do ID de email %s
 
 ##### Export #####
 ExportsArea=Área de Exportações
@@ -260,5 +261,7 @@ WebsiteSetup=Configuração do módulo Website
 WEBSITE_PAGEURL=URL da página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descrição
+WEBSITE_IMAGE=Imagem
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Palavras-chave
 LinesToImport=Linhas a importar
diff --git a/htdocs/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang
index 2d9a0dd25a7..18ed6d8b0c8 100644
--- a/htdocs/langs/pt_PT/paybox.lang
+++ b/htdocs/langs/pt_PT/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Configurar módulo PayBox
 PayBoxDesc=Este módulo oferece uma página para permitir o pagamento de clientes no <a href="http://www.paybox.com" target="_blank">Paybox</a>. Isto pode ser utilizado para pagamento livre ou para um pagamento em particular de um objeto Dolibarr (fatura, ordem, ...)
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
 PaymentForm=Forma de pagamento
-WelcomeOnPaymentPage=Bem-vindo aos nossos serviços de pagamento online
+WelcomeOnPaymentPage=Bem-vindo ao nosso serviço de pagamento online
 ThisScreenAllowsYouToPay=Esta tela permite que você faça o seu pagamento online destinado a %s.
 ThisIsInformationOnPayment=Aqui estão as informações de pagamento para fazer
 ToComplete=A completar
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL que fornece pagamento on-line interfac
 ToOfferALinkForOnlinePaymentOnContractLine=URL que fornece linha de pagamento  interface% com base na quantidade de uma linha de contrato
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL que fornece pagamento on-line %s interface baseada numa quantidade livre
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL para oferecer uma interface on-line %s pagamento de uma subscrição de membro
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Você também pode adicionar o parâmetro url <b>&tag=<i>value</i></b>  para o endereço (exigida apenas para o pagamento livre) para ver o seu código próprio, observação do pagamento.
-SetupPayBoxToHavePaymentCreatedAutomatically=Configure o seu url PayBox <b>%s</b> para que o pagamento seja criado automaticamente ao confirmar.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Esta página confirma que o pagamento tenha sido gravada. Obrigado.
-YourPaymentHasNotBeenRecorded=Você o pagamento não tenha sido gravada e transação foi cancelada. Obrigado.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Conta parâmetros
 UsageParameter=Parâmetros de uso
 InformationToFindParameters=Ajuda para encontrar informações de sua conta %s
diff --git a/htdocs/langs/pt_PT/paypal.lang b/htdocs/langs/pt_PT/paypal.lang
index 8120a672c4b..4f16f939c6d 100644
--- a/htdocs/langs/pt_PT/paypal.lang
+++ b/htdocs/langs/pt_PT/paypal.lang
@@ -1,20 +1,19 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configurar módulo do PayPal
-PaypalDesc=Este módulo oferece uma página para permitir o pagamento de clientes no <a href="http://www.paypal.com" target="_blank">PayPal</a>. Isto pode ser utilizado para um pagamento livre ou para um pagamento em particular de um objeto Dolibarr (fatura, ordem, ...)
-PaypalOrCBDoPayment=Pagar com Paypal (Cartão de Crédito ou Paypal)
-PaypalDoPayment=Pague com Paypal
+PaypalDesc=Este módulo permite o pagamento em <a href="http://www.paypal.com" target="_blank"> PayPal </a> pelos clientes. Isso pode ser usado para um pagamento gratuito ou para um pagamento em um determinado objeto Dolibarr (fatura, ordem, ...)
+PaypalOrCBDoPayment=Pague com PayPal (cartão de crédito ou PayPal)
+PaypalDoPayment=Pague com PayPal
 PAYPAL_API_SANDBOX=Modo de teste / sandbox
 PAYPAL_API_USER=Nome de utilizador API
 PAYPAL_API_PASSWORD=Senha API
 PAYPAL_API_SIGNATURE=Assinatura API
 PAYPAL_SSLVERSION=Versão do Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pagamento "integral" (Cartão de Crédito + Paypal) ou apenas "Paypal"
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pagamento "integral" (cartão de crédito + PayPal) ou "PayPal" apenas
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Apenas Paypal
-ONLINE_PAYMENT_CSS_URL=URL opcional da folha de estilo CSS na página de pagamento online
+ONLINE_PAYMENT_CSS_URL=URL opcional da folha de estilo CSS na página de pagamento on-line
 ThisIsTransactionId=Esta é id. da transação: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Adicionar o url de pagamento Paypal quando enviar um documento por correio eletrónico
-YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
+PAYPAL_ADD_PAYMENT_URL=Adicione o URL do pagamento do PayPal quando enviar um documento por correio
 NewOnlinePaymentReceived=Novo pagamento online recebido
 NewOnlinePaymentFailed=Novo pagamento em linha tentado, mas falhado
 ONLINE_PAYMENT_SENDEMAIL=Correio eletrónico para avisar depois de um pagamento (bem sucedido ou não)
@@ -28,7 +27,8 @@ ShortErrorMessage=Mensagem de Erro Abreviada
 ErrorCode=Código de Erro
 ErrorSeverityCode=Código de Severidade do Erro
 OnlinePaymentSystem=Sistema de pagamento online
-PaypalLiveEnabled=Paypal ativado (caso contrário, este encontra-se em modo teste)
-PaypalImportPayment=Importar pagamentos do Paypal
+PaypalLiveEnabled=PayPal ativado ao vivo (caso contrário, modo de teste / sandbox)
+PaypalImportPayment=Importar pagamentos do PayPal
 PostActionAfterPayment=Ações posteriores depois dos pagamentos
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ARollbackWasPerformedOnPostActions=Uma reversão foi executada em todas as ações do Post. Você deve concluir as ações de postagem manualmente, se necessário.
+ValidationOfPaymentFailed=A validação do pagamento falhou
diff --git a/htdocs/langs/pt_PT/printing.lang b/htdocs/langs/pt_PT/printing.lang
index a12315ff9d0..ecba9f72f72 100644
--- a/htdocs/langs/pt_PT/printing.lang
+++ b/htdocs/langs/pt_PT/printing.lang
@@ -2,15 +2,15 @@
 Module64000Name=Impressão Direta
 Module64000Desc=Ativar Sistema de impressão Direta
 PrintingSetup=Configurar o Sistema de Impressão Direta
-PrintingDesc=Este módulo adiciona um botão Imprimir para enviar documentos diretamente para uma impressora (sem abrir documento numa aplicação à parte) com vários módulos.
-MenuDirectPrinting=Trabalhos de impressão direta
+PrintingDesc=Este módulo adiciona um botão Imprimir a vários módulos para permitir que os documentos sejam impressos diretamente em uma impressora sem precisar abrir o documento em outro aplicativo.
+MenuDirectPrinting=Tarefas de impressão direta
 DirectPrint=Impressão direta
 PrintingDriverDesc=Variáveis da configuração para o controlador de impressão.
 ListDrivers=Lista de Controladores
 PrintTestDesc=Lista de Impressoras.
 FileWasSentToPrinter=O ficheiro %s foi enviado para a inpressora
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+ViaModule=através do módulo
+NoActivePrintingModuleFound=Nenhum driver ativo para imprimir o documento. Verifique a configuração do módulo %s.
 PleaseSelectaDriverfromList=Por favor, selecione um controlador da lista.
 PleaseConfigureDriverfromList=Configure o driver selecionado na lista.
 SetupDriver=Configuração da driver
@@ -19,15 +19,15 @@ UserConf=Configuração por utilizador
 PRINTGCP_INFO=Configuração da API do Google OAuth
 PRINTGCP_AUTHLINK=Autenticação
 PRINTGCP_TOKEN_ACCESS=Token OAuth do Google Cloud Print
-PrintGCPDesc=Este controlador permite-lhe enviar documentos diretamente para uma impressora com a Impressão na Nuvem da Google.
+PrintGCPDesc=Este driver permite enviar documentos diretamente para uma impressora usando o Google Cloud Print.
 GCP_Name=Nome
-GCP_displayName=Exibir Nome
+GCP_displayName=Nome a exibir
 GCP_Id=Id. da Impressora
 GCP_OwnerName=Nome do Fabricante
 GCP_State=Estado da Impressora
 GCP_connectionStatus=Estado Online
 GCP_Type=Tipo de Impressora
-PrintIPPDesc=Este driver permite enviar documentos diretamente para uma impressora. Requer um sistema Linux com o CUPS instalado.
+PrintIPPDesc=Este driver permite o envio de documentos diretamente para uma impressora. Requer um sistema Linux com o CUPS instalado.
 PRINTIPP_HOST=Servidor de Impressão
 PRINTIPP_PORT=Porta
 PRINTIPP_USER=Iniciar Sessão
@@ -45,8 +45,10 @@ IPP_Color=Cor
 IPP_Device=Dispositivo
 IPP_Media=Média da impressora
 IPP_Supported=Tipo de média
-DirectPrintingJobsDesc=Esta página lista os trabalhos de impressão encontrados para as impressoras disponíveis.
+DirectPrintingJobsDesc=Esta página lista as tarefas de impressão encontradas para as impressoras disponíveis.
 GoogleAuthNotConfigured=A configuração do Google OAuth não foi efetuada. Ative o módulo OAuth e defina um ID/Segredo do Google.
 GoogleAuthConfigured=As credenciais do Google OAuth foram encontradas na configuração do módulo OAuth.
 PrintingDriverDescprintgcp=Variáveis ​​de configuração para o driver de impressão do Google Cloud Print.
+PrintingDriverDescprintipp=Variáveis ​​de configuração para o driver de impressão.
 PrintTestDescprintgcp=Lista de Impressoras para a Impressão na Nuvem da Google
+PrintTestDescprintipp=Lista de impressoras para copos.
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 394c10e49dc..5cc1ff2a39c 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Ref. de produto
+ProductRef=Ref. do produto
 ProductLabel=Etiqueta do produto
 ProductLabelTranslated=Etiqueta do produto traduzida
 ProductDescriptionTranslated=Categoria do produto traduzida
@@ -14,15 +14,15 @@ Service=Serviço
 ProductId=ID Produto/Serviço
 Create=Criar
 Reference=Referencia
-NewProduct=Novo Produto
-NewService=Novo Serviço
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+NewProduct=Novo produto
+NewService=Novo serviço
+ProductVatMassChange=Alteração de IVA em massa
+ProductVatMassChangeDesc=Esta página pode ser usada para modificar uma taxa de IVA definida em produtos ou serviços de um valor para outro. Atenção, essa alteração é global / feita em todo o banco de dados.
+MassBarcodeInit=Inicialização por código de barras em massa
+MassBarcodeInitDesc=Esta página pode ser usada para inicializar um código de barras em objetos que não possuem código de barras definido. Verifique antes que a configuração do código de barras do módulo esteja concluída.
 ProductAccountancyBuyCode=Código de contabilidade (compra)
 ProductAccountancySellCode=Código de contabilidade (venda)
-ProductAccountancySellIntraCode=Código de contabilidade (venda intra-comunitária)
+ProductAccountancySellIntraCode=Código contábil (venda intracomunitária)
 ProductAccountancySellExportCode=Código de contabilidade (venda exportação)
 ProductOrService=Produto ou Serviço
 ProductsAndServices=Produtos e Serviços
@@ -57,26 +57,26 @@ ProductStatusOnBuy=Para compra
 ProductStatusNotOnBuy=Não é para compra
 ProductStatusOnBuyShort=Para compra
 ProductStatusNotOnBuyShort=Não é para compra
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+UpdateVAT=Atualizar IVA
+UpdateDefaultPrice=Atualizar preço padrão
+UpdateLevelPrices=Atualizar preços para cada nível
 AppliedPricesFrom=Preço de venda válido a partir de
 SellingPrice=Preço de venda
 SellingPriceHT=Preço de venda (sem IVA)
 SellingPriceTTC=Preço de venda (inc. IVA)
 CostPriceDescription=Este preço (sem IVA) pode ser usado para armazenar o valor médio deste produto para sua empresa. Pode ser qualquer preço que você calcula, por exemplo, do preço médio de compra mais o custo médio de produção e distribuição.
-CostPriceUsage=This value could be used for margin calculation.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+CostPriceUsage=Este valor pode ser usado para o cálculo da margem.
+SoldAmount=Quantidade vendida
+PurchasedAmount=Quantidade comprada
 NewPrice=Novo preço
 MinPrice=Preço de venda mínimo
-EditSellingPriceLabel=Edit selling price label
+EditSellingPriceLabel=Editar etiqueta de preço de venda
 CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
 ContractStatusClosed=Fechado
 ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorrecto
 ErrorProductClone=Ocorreu um problema ao tentar clonar o produto ou serviço.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorPriceCantBeLowerThanMinPrice=Erro, o preço não pode ser inferior ao preço mínimo.
 Suppliers=Fornecedores
 SupplierRef=Ref. fornecedor
 ShowProduct=Mostrar produto
@@ -97,18 +97,18 @@ NoteNotVisibleOnBill=Nota (não visível nas faturas, orçamentos, ...)
 ServiceLimitedDuration=Sim o serviço é de Duração limitada :
 MultiPricesAbility=Vários segmentos de preços por produto/serviço (cada cliente enquadra-se num segmento)
 MultiPricesNumPrices=Nº de preços
-AssociatedProductsAbility=Ative o recurso para gerir produtos virtuais
-AssociatedProducts=Produtos associados
+AssociatedProductsAbility=Ativar produtos virtuais (kits)
+AssociatedProducts=Produtos virtuais
 AssociatedProductsNumber=Nº de produtos associados
 ParentProductsNumber=Número de produtos de embalagem fonte
-ParentProducts=Parent products
+ParentProducts=Produtos para pais
 IfZeroItIsNotAVirtualProduct=Se 0, este produto não é um produto virtual
 IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não é usado por nenhum produto virtual
 KeywordFilter=Filtro por Chave
 CategoryFilter=Filtro por categoría
 ProductToAddSearch=Procurar produtos a Adicionar
 NoMatchFound=Não foram encontrados resultados
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Lista de produtos / serviços
 ProductAssociationList=Lista de produtos/serviços que são componentes deste produto/pacote virtual
 ProductParentList=Lista de produtos e serviços com este produto como um componente
 ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso
@@ -124,17 +124,17 @@ ConfirmDeleteProductLine=Tem a certeza que quer eliminar esta linha de produto?
 ProductSpecial=Especial
 QtyMin=Qtd mínima
 PriceQtyMin=Preço para esta qt. mín. (s/ o desconto)
-PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
+PriceQtyMinCurrency=Preço para este min. qty (sem desconto) (moeda)
 VATRateForSupplierProduct=Taxa de IVA (para este fornecedor/produto)
 DiscountQtyMin=Desconto predefinido para a qt.
 NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
 NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. Fornecedor definida para este produto
 PredefinedProductsToSell=Produtos predefinidos para venda
-PredefinedServicesToSell=Predefined services to sell
+PredefinedServicesToSell=Serviços pré-definidos para vender
 PredefinedProductsAndServicesToSell=Produtos/serviços predefinidos para venda
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Produtos/serviços predefinidos para compra
+PredefinedProductsToPurchase=Produto predefinido para comprar
+PredefinedServicesToPurchase=Serviços pré-definidos para compra
+PredefinedProductsAndServicesToPurchase=Produtos / serviços predefinidos para compra
 NotPredefinedProducts=Produto /serviços não predefinidos
 GenerateThumb=Gerar a etiqueta
 ServiceNb=Serviço nº %s
@@ -145,23 +145,23 @@ Finished=Produto fabricado
 RowMaterial=Matéria Prima
 CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que deseja clonar este produto ou serviço <b>%s</b>?
-CloneContentProduct=Copie todas as principais informações do produto / serviço
+CloneContentProduct=Clone todas as informações principais do produto / serviço
 ClonePricesProduct=Clone preços
 CloneCompositionProduct=Clonar produto/serviço embalado
 CloneCombinationsProduct=Clonar variantes de produto
 ProductIsUsed=Este produto é utilizado
-NewRefForClone=Ref. do novo produto / serviço
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
+NewRefForClone=Ref. do novo produto/serviço
+SellingPrices=Preços de venda
+BuyingPrices=Preços de compra
 CustomerPrices=Preços aos clientes
 SuppliersPrices=Preços dos fornecedores
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+SuppliersPricesOfProductsOrServices=Preços de fornecedores (de produtos ou serviços)
+CustomCode=Código Aduaneiro / Commodity / HS
 CountryOrigin=País de origem
 Nature=Natureza
-ShortLabel=Short label
+ShortLabel=Rótulo curto
 Unit=Unidade
-p=u.
+p=você.
 set=definir
 se=definir
 second=segundo
@@ -181,47 +181,47 @@ m2=m²
 m3=m³
 liter=litro
 l=L
-unitP=Piece
-unitSET=Set
+unitP=Peça
+unitSET=Conjunto
 unitS=Segundo
 unitH=Hora
 unitD=Dia
-unitKG=Kilogram
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
+unitKG=Quilograma
+unitG=Grama
+unitM=Metro
+unitLM=Metro linear
+unitM2=Metro quadrado
+unitM3=Metro cúbico
+unitL=Litro
 ProductCodeModel=Modelo de referência do produto
 ServiceCodeModel=Modelo de referência de serviço
 CurrentProductPrice=Preço atual
 AlwaysUseNewPrice=Usar sempre o preço atual do produto/serviço
 AlwaysUseFixedPrice=Utilizar o preço fixo
 PriceByQuantity=Preços diferentes por quantidade
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Desativar preços por quantidade
 PriceByQuantityRange=Gama de quantidades
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Example: COL
-VariantLabelExample=Example: Color
+MultipriceRules=Regras de segmento de preço
+UseMultipriceRules=Utilizar regras de segmento de preço (definidas na configuração do módulo do produto) para calcular automaticamente os preços de todos os outros segmentos de acordo com o primeiro segmento
+PercentVariationOver=variação %% sobre %s
+PercentDiscountOver=%% desconto sobre %s
+KeepEmptyForAutoCalculation=Mantenha vazio para calcular automaticamente o peso ou o volume dos produtos
+VariantRefExample=Exemplo: COL
+VariantLabelExample=Exemplo: cor
 ### composition fabrication
 Build=Produzir
 ProductsMultiPrice=Produtos e preços para cada segmento de preço
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
+ProductsOrServiceMultiPrice=Preços ao cliente (de produtos ou serviços, preços múltiplos)
+ProductSellByQuarterHT=Volume de negócios de produtos trimestral antes de impostos
+ServiceSellByQuarterHT=Volume de negócios dos serviços trimestral antes de impostos
 Quarter1=1º Trimestre
 Quarter2=2º Trimestre
 Quarter3=3º Trimestre
 Quarter4=4º Trimestre
 BarCodePrintsheet=Imprimir código de barras
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
+PageToGenerateBarCodeSheets=Com esta ferramenta, você pode imprimir folhas de adesivos de código de barras. Escolha o formato da sua página de adesivos, o tipo de código de barras e o valor do código de barras, depois clique no botão <b> %s </ b>.
+NumberOfStickers=Número de adesivos para imprimir na página
+PrintsheetForOneBarCode=Imprima vários adesivos para um código de barras
 BuildPageToPrint=Gerar página para impressão
 FillBarCodeTypeAndValueManually=Preencha o tipo de código de barras e o valor, manualmente.
 FillBarCodeTypeAndValueFromProduct=Preencha o tipo de código de barras e o valor a partir do código de barras de um produto.
@@ -229,108 +229,111 @@ FillBarCodeTypeAndValueFromThirdParty=Preencha o tipo de código de barras e o v
 DefinitionOfBarCodeForProductNotComplete=Definição do tipo ou valor do código de barras não completo para o produto %s.
 DefinitionOfBarCodeForThirdpartyNotComplete=Definição do tipo ou valor do código de barras não completo para o terceiro %s.
 BarCodeDataForProduct=Informações de código de barras do produto %s:
-BarCodeDataForThirdparty=Barcode information of third party %s :
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
+BarCodeDataForThirdparty=Informações de código de barras de terceiros %s:
+ResetBarcodeForAllRecords=Defina o valor do código de barras para todos os registros (isso também redefinirá o valor do código de barras já definido com novos valores)
+PriceByCustomer=Preços diferentes para cada cliente
+PriceCatalogue=Um único preço de venda por produto / serviço
+PricingRule=Regras para preços de venda
 AddCustomerPrice=Adicionar preço por produto
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
+ForceUpdateChildPriceSoc=Definir o mesmo preço em subsidiárias de clientes
+PriceByCustomerLog=Log dos preços anteriores do cliente
+MinimumPriceLimit=O preço mínimo não pode ser menor que %s
+MinimumRecommendedPrice=O preço mínimo recomendado é: %s
+PriceExpressionEditor=Editor de expressão de preço
+PriceExpressionSelected=Expressão de preço selecionada
+PriceExpressionEditorHelp1="preço = 2 + 2" ou "2 + 2" para definir o preço. Usar ; separar expressões
+PriceExpressionEditorHelp2=Você pode acessar ExtraFields com variáveis ​​como <b> #extrafield_myextrafieldkey # </ b> e variáveis ​​globais com <b> #global_mycode # </ b>
+PriceExpressionEditorHelp3=Em ambos os preços de produto / serviço e fornecedor, existem estas variáveis ​​disponíveis: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # peso # # comprimento # # superfície # # preço_min # </ b>
+PriceExpressionEditorHelp4=Apenas no preço do produto / serviço: <b> #supplier_min_price # </ b> <br> Apenas nos preços de fornecedor: <b> # supplier_quantity # e #supplier_tva_tx # </ b>
+PriceExpressionEditorHelp5=Valores globais disponíveis:
+PriceMode=Modo de preço
 PriceNumeric=Número
 DefaultPrice=Preço Predefinido
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
+ComposedProductIncDecStock=Aumentar / Diminuir o estoque na mudança pai
+ComposedProduct=Subproduto
 MinSupplierPrice=Preço de compra mínimo
-MinCustomerPrice=Minimum selling price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+MinCustomerPrice=Preço mínimo de venda
+DynamicPriceConfiguration=Configuração dinâmica de preços
+DynamicPriceDesc=No cartão do produto, com este módulo ativado, você deve ser capaz de definir funções matemáticas para calcular os preços do Cliente ou do Fornecedor. Tal função pode usar todos os operadores matemáticos, algumas constantes e variáveis. Você pode definir aqui as variáveis ​​que deseja usar e, se a variável precisar de uma atualização automática, a URL externa a ser usada para solicitar ao Dolibarr que atualize o valor automaticamente.
+AddVariable=Adicionar Variável
+AddUpdater=Adicionar atualizador
 GlobalVariables=Variáveis globais
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
+VariableToUpdate=Variável para atualizar
+GlobalVariableUpdaters=Atualizadores de Variáveis ​​Globais
 GlobalVariableUpdaterType0=Dados JSON
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterHelp0=Analisa os dados JSON do URL especificado, VALUE especifica a localização do valor relevante,
+GlobalVariableUpdaterHelpFormat0=Formato para solicitação {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
 GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+GlobalVariableUpdaterHelp1=Analisa os dados do WebService da URL especificada, o NS especifica o espaço de nomes, VALUE especifica a localização do valor relevante, DATA deve conter os dados a enviar e METHOD é o método WS de chamada
+GlobalVariableUpdaterHelpFormat1=O formato da solicitação é {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Intervalo de atualização (minutos)
-LastUpdated=Latest update
+LastUpdated=Última atualização
 CorrectlyUpdated=Corretamente atualizado
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductActualFile=Os arquivos usados ​​para adicionar ao PDF Azur são / é
 PropalMergePdfProductChooseFile=Selecionar ficheiros PDF
-IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
+IncludingProductWithTag=Incluindo produto / serviço com tag
+DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, preço real pode depender do cliente
+WarningSelectOneDocument=Por favor, selecione pelo menos um documento
 DefaultUnitToShow=Unidade
 NbOfQtyInProposals=Quantidade nos orçamentos
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products or services translation
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
+ClinkOnALinkOfColumn=Clique no link da coluna %s para obter uma visão detalhada ...
+ProductsOrServicesTranslations=Tradução de produtos ou serviços
+TranslatedLabel=Etiqueta traduzida
+TranslatedDescription=Descrição traduzida
+TranslatedNote=Notas traduzidas
+ProductWeight=Peso para 1 produto
+ProductVolume=Volume para 1 produto
+WeightUnits=Unidade de peso
+VolumeUnits=Unidade de volume
+SizeUnits=Unidade de tamanho
+DeleteProductBuyPrice=Suprimir preço de compra
 ConfirmDeleteProductBuyPrice=Tem certeza de que deseja eliminar este preço de compra?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-
+SubProduct=Subproduto
+ProductSheet=Ficha do Produto
+ServiceSheet=Folha de serviço
+PossibleValues=Valores possíveis
+GoOnMenuToCreateVairants=Vá no menu %s - %s para preparar variantes de atributos (como cores, tamanho, ...)
+UseProductFournDesc=Use descrições de fornecedores de produtos em documentos do fornecedor
+ProductSupplierDescription=Descrição do fornecedor para o produto
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+VariantAttributes=Atributos variantes
+ProductAttributes=Atributos variantes para produtos
+ProductAttributeName=Atributo variante %s
+ProductAttribute=Atributo variante
+ProductAttributeDeleteDialog=Tem certeza de que deseja excluir este atributo? Todos os valores serão excluídos
+ProductAttributeValueDeleteDialog=Tem certeza de que deseja excluir o valor "%s" com a referência "%s" deste atributo?
+ProductCombinationDeleteDialog=Tem certeza de que deseja excluir a variante do produto "<strong> %s </ strong>"?
+ProductCombinationAlreadyUsed=Ocorreu um erro ao excluir a variante. Por favor, verifique se não está sendo usado em nenhum objeto
 ProductCombinations=Variantes
 PropagateVariant=Propagar variantes
-HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
+HideProductCombinations=Ocultar variante de produtos no seletor de produtos
+ProductCombination=Variante
+NewProductCombination=Nova variante
+EditProductCombination=Variante de edição
 NewProductCombinations=Novas variantes
 EditProductCombinations=Edição de variantes
-SelectCombination=Select combination
+SelectCombination=Selecione a combinação
 ProductCombinationGenerator=Gerador de variantes
-Features=Features
-PriceImpact=Price impact
-WeightImpact=Weight impact
+Features=Características
+PriceImpact=Impacto no preço
+WeightImpact=Impacto no peso
 NewProductAttribute=Novo atributo
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
+NewProductAttributeValue=Novo valor de atributo
+ErrorCreatingProductAttributeValue=Ocorreu um erro ao criar o valor do atributo. Pode ser porque já existe um valor com essa referência
+ProductCombinationGeneratorWarning=Se você continuar, antes de gerar novas variantes, todas as anteriores serão DELETADAS. Já os existentes serão atualizados com os novos valores
+TooMuchCombinationsWarning=Gerar muitas variantes pode resultar em alta CPU, uso de memória e o Dolibarr não consegue criá-las. Ativar a opção "%s" pode ajudar a reduzir o uso de memória.
+DoNotRemovePreviousCombinations=Não remova variantes anteriores
+UsePercentageVariations=Use variações percentuais
 PercentageVariation=Variação percentual
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=Nb of different values
-NbProducts=Nb. of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
+ErrorDeletingGeneratedProducts=Ocorreu um erro ao tentar excluir variantes de produtos existentes
+NbOfDifferentValues=No. de valores diferentes
+NbProducts=No. de produtos
+ParentProduct=Produto pai
+HideChildProducts=Ocultar produtos variantes
+ShowChildProducts=Mostrar produtos variantes
+NoEditVariants=Vá para o cartão do produto pai e edite o impacto do preço das variantes na guia "Variantes"
+ConfirmCloneProductCombinations=Você gostaria de copiar todas as variantes do produto para o outro produto pai com a referência fornecida?
+CloneDestinationReference=Referência do produto de destino
+ErrorCopyProductCombinations=Ocorreu um erro ao copiar as variantes do produto
+ErrorDestinationProductNotFound=Produto de destino não encontrado
+ErrorProductCombinationNotFound=Variante de produto não encontrada
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index a7b4655ac3e..32d0adc75c6 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contactos do Projeto
 ProjectsImContactFor=Projetos nos quais sou um contacto
 AllAllowedProjects=Todos os projetos que eu posso ler (meus + público)
 AllProjects=Todos os Projetos
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=Essa visão é limitada a projetos para os quais você é um contato
 ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está autorizado a ler.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Esta visão apresenta todas as tarefas em projetos que você pode ler.
 ProjectsPublicTaskDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 ProjectsDesc=Esta visualização apresenta todos os projetos (as suas permissões de utilizador concedem-lhe a permissão para ver tudo).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+TasksOnProjectsDesc=Esta visão apresenta todas as tarefas em todos os projetos (suas permissões de usuário permitem que você veja tudo).
+MyTasksDesc=Esta visão é limitada a projetos ou tarefas para as quais você é um contato.
 OnlyOpenedProject=Apenas os projetos abertos estão visíveis (projetos em estado rascunho ou fechado não estão visíveis).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Projetos fechados não são visíveis.
 TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+AllTaskVisibleButEditIfYouAreAssigned=Todas as tarefas para projetos qualificados são visíveis, mas você pode inserir o tempo apenas para a tarefa atribuída ao usuário selecionado. Atribuir tarefa se você precisar inserir tempo nela.
+OnlyYourTaskAreVisible=Somente tarefas atribuídas a você estão visíveis. Atribua tarefas a si mesmo se não estiver visível e você precisar inserir tempo nela.
 ImportDatasetTasks=Tarefas dos projetos
 ProjectCategories=Etiquetas/categorias de projeto
 NewProject=Novo projeto
@@ -33,14 +33,14 @@ ConfirmDeleteAProject=Tem certeza de que deseja eliminar este projeto?
 ConfirmDeleteATask=Tem certeza de que deseja eliminar esta tarefa?
 OpenedProjects=Projetos abertos
 OpenedTasks=Abrir tarefas
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
+OpportunitiesStatusForOpenedProjects=Leva quantidade de projetos abertos por status
+OpportunitiesStatusForProjects=Leva quantidade de projetos por status
 ShowProject=Mostrar Projeto
 ShowTask=Ver tarefa
 SetProject=Definir Projeto
 NoProject=Nenhum projeto definido ou possuído
-NbOfProjects=No. of projects
-NbOfTasks=No. of tasks
+NbOfProjects=Nº de projetos
+NbOfTasks=No. de tarefas
 TimeSpent=Tempo Dispendido
 TimeSpentByYou=Tempo gasto por você
 TimeSpentByUser=Tempo gasto pelo utilizador
@@ -55,7 +55,7 @@ TasksOnOpenedProject=Tarefas em projetos abertos
 WorkloadNotDefined=Carga de trabalho não definida
 NewTimeSpent=Tempos Dispendidos
 MyTimeSpent=Meu Tempo Dispendido
-BillTime=Bill the time spent
+BillTime=Bill o tempo gasto
 Tasks=Tarefas
 Task=Tarefa
 TaskDateStart=Data de início da tarefa
@@ -63,8 +63,8 @@ TaskDateEnd=Data do fim da tarefa
 TaskDescription=Descrição da tarefa
 NewTask=Nova tarefa
 AddTask=Criar Tarefa
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
+AddTimeSpent=Crie tempo gasto
+AddHereTimeSpentForDay=Adicione aqui o tempo gasto para este dia / tarefa
 Activity=Atividade
 Activities=Tarefas/Atividades
 MyActivities=As Minhas Tarefas/Atividades
@@ -75,34 +75,34 @@ ProgressDeclared=Progresso declarado
 ProgressCalculated=Progresso calculado
 Time=Tempo
 ListOfTasks=Lista de tarefas
-GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTimeConsumed=Ir para a lista de tempo consumido
 GoToListOfTasks=Ir para a lista de tarefas
-GoToGanttView=Go to Gantt view
-GanttView=Gantt View
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of customer orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of supplier orders related to the project
-ListSupplierInvoicesAssociatedProject=List of supplier invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+GoToGanttView=Ir para a vista de Gantt
+GanttView=Vista de Gantt
+ListProposalsAssociatedProject=Lista das propostas comerciais relacionadas ao projeto
+ListOrdersAssociatedProject=Lista de pedidos de clientes relacionados ao projeto
+ListInvoicesAssociatedProject=Lista de faturas de clientes relacionadas ao projeto
+ListPredefinedInvoicesAssociatedProject=Lista de faturas de modelos de clientes relacionadas ao projeto
+ListSupplierOrdersAssociatedProject=Lista de pedidos de fornecedores relacionados ao projeto
+ListSupplierInvoicesAssociatedProject=Lista de faturas de fornecedores relacionadas ao projeto
+ListContractAssociatedProject=Lista de contratos relacionados ao projeto
+ListShippingAssociatedProject=Lista de embarques relacionados ao projeto
+ListFichinterAssociatedProject=Lista de intervenções relacionadas ao projeto
+ListExpenseReportsAssociatedProject=Lista de relatórios de despesas relacionados ao projeto
+ListDonationsAssociatedProject=Lista de doações relacionadas ao projeto
+ListVariousPaymentsAssociatedProject=Lista de pagamentos diversos relacionados ao projeto
+ListSalariesAssociatedProject=Lista de pagamentos de salários relacionados ao projeto
+ListActionsAssociatedProject=Lista de eventos relacionados ao projeto
+ListTaskTimeUserProject=Lista de tempo consumido em tarefas do projeto
+ListTaskTimeForTask=Lista de tempo consumido na tarefa
+ActivityOnProjectToday=Atividade no projeto hoje
+ActivityOnProjectYesterday=Atividade no projeto ontem
 ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
 ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
 ActivityOnProjectThisYear=Actividade do Projecto neste Ano
 ChildOfProjectTask=Link do Projeto/Tarefa
 ChildOfTask=Filho da tarefa
-TaskHasChild=Task has child
+TaskHasChild=Tarefa tem filho
 NotOwnerOfProject=Não é responsável por este projeto privado
 AffectedTo=Atribuido a
 CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por alguns objetos (faturas, pedidos e outros). ver lista de referencias.
@@ -110,14 +110,14 @@ ValidateProject=Validar projeto
 ConfirmValidateProject=Tem certeza de que deseja validar este projeto?
 CloseAProject=Fechar projeto
 ConfirmCloseAProject=Tem a certeza de que deseja fechar este projeto?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+AlsoCloseAProject=Também feche o projeto (mantenha-o aberto se você ainda precisar seguir as tarefas de produção)
 ReOpenAProject=Reabrir projeto
 ConfirmReOpenAProject=Tem a certeza de que deseja reabrir este projeto?
 ProjectContact=Contactos do Projeto
-TaskContact=Task contacts
+TaskContact=Contatos da tarefa
 ActionsOnProject=Ações sobre o projeto
 YouAreNotContactOfProject=Não é um contato deste projeto privado
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=O usuário não é um contato deste projeto privado
 DeleteATimeSpent=Excluir o tempo gasto
 ConfirmDeleteATimeSpent=Tem certeza de que deseja eliminar este tempo gasto?
 DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas
@@ -126,7 +126,7 @@ TaskRessourceLinks=Tarefa de contactos
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
 NoTasks=Não existem tarefas para este projeto
 LinkedToAnotherCompany=Vinculado a Terceiros
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Tarefa não atribuída ao usuário. Use o botão '<strong> %s </ strong>' para atribuir tarefa agora.
 ErrorTimeSpentIsEmpty=Tempo dispensado está vazio
 ThisWillAlsoRemoveTasks=Esta ação também vai excluir todas as tarefas do projeto (<b>%s</b> tarefas no momento) e todas as entradas de tempo dispensadas.
 IfNeedToUseOhterObjectKeepEmpty=Caso alguns objetos (fatura, encomenda, ...), pertencentes a um terceiro, deve estar vinculado ao projeto para criar, manter este vazio para ter o projeto sendo multi-terceiros.
@@ -134,8 +134,8 @@ CloneProject=Clonar projeto
 CloneTasks=Clonar tarefas
 CloneContacts=Clonar contactos
 CloneNotes=Clonar notas
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneProjectFiles=Projeto clone juntou arquivos
+CloneTaskFiles=Tarefa (s) clone (s) juntou-se a arquivos (se a tarefa foi clonada)
 CloneMoveDate=Atualizar as datas dos projetos/tarefas a partir de agora?
 ConfirmCloneProject=Tem a certeza de que deseja clonar este projeto?
 ProjectReportDate=Alterar as datas das tarefas de acordo com a nova data de início do projeto
@@ -147,14 +147,14 @@ ProjectModifiedInDolibarr=Projeto %s, modificado
 TaskCreatedInDolibarr=%s tarefas criadas
 TaskModifiedInDolibarr=%s tarefas modificadas
 TaskDeletedInDolibarr=%s tarefas apagadas
-OpportunityStatus=Lead status
+OpportunityStatus=Status de lead
 OpportunityStatusShort=Estado da Opu.
-OpportunityProbability=Lead probability
+OpportunityProbability=Probabilidade de chumbo
 OpportunityProbabilityShort=Opp. probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Opp. amount
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
+OpportunityAmount=Quantidade de chumbo
+OpportunityAmountShort=Opp. montante
+OpportunityAmountAverageShort=Média Opp. montante
+OpportunityAmountWeigthedShort=Opp ponderada montante
 WonLostExcluded=Ganho/Perdido excluído
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Líder do projeto
@@ -168,50 +168,50 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador
 SelectElement=Selecionar elemento
 AddElement=Ligar ao elemento
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelBeluga=Modelo de documento de projeto para visão geral de objetos vinculados
+DocumentModelBaleine=Modelo de documento de projeto para tarefas
+DocumentModelTimeSpent=Modelo de relatório do projeto para o tempo gasto
 PlannedWorkload=Carga de trabalho prevista
-PlannedWorkloadShort=Workload
+PlannedWorkloadShort=Carga de trabalho
 ProjectReferers=Itens relacionados
 ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+FirstAddRessourceToAllocateTime=Atribuir um recurso do usuário à tarefa para alocar tempo
+InputPerDay=Entrada por dia
+InputPerWeek=Entrada por semana
+InputDetail=Detalhe da entrada
+TimeAlreadyRecorded=Este é o tempo gasto já gravado para esta tarefa / dia e usuário %s
 ProjectsWithThisUserAsContact=Projetos com este utilizador como contacto
 TasksWithThisUserAsContact=Tarefas atribuídas a este utilizador
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
+ResourceNotAssignedToProject=Não atribuído ao projeto
+ResourceNotAssignedToTheTask=Não atribuído à tarefa
+NoUserAssignedToTheProject=Nenhum usuário atribuído a este projeto
+TimeSpentBy=Tempo gasto por
+TasksAssignedTo=Tarefas atribuídas a
+AssignTaskToMe=Atribuir tarefa para mim
+AssignTaskToUser=Atribuir tarefa a %s
+SelectTaskToAssign=Selecione a tarefa para atribuir ...
 AssignTask=Atribuir 
 ProjectOverview=Resumo
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageTasks=Use projetos para acompanhar tarefas e / ou relatar o tempo gasto (quadros de horários)
 ManageOpportunitiesStatus=Usar projetos para seguir leads/oportunidades
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+ProjectNbProjectByMonth=Nº de projetos criados por mês
+ProjectNbTaskByMonth=Nº de tarefas criadas por mês
+ProjectOppAmountOfProjectsByMonth=Quantidade de leads por mês
+ProjectWeightedOppAmountOfProjectsByMonth=Quantidade ponderada de leads por mês
+ProjectOpenedProjectByOppStatus=Abrir projeto / liderar por status de lead
+ProjectsStatistics=Estatísticas sobre projetos / leads
+TasksStatistics=Estatísticas sobre tarefas de projeto / lead
+TaskAssignedToEnterTime=Tarefa atribuída. A inserção de tempo nesta tarefa deve ser possível.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
+YouCanCompleteRef=Se você quiser completar o ref com algumas informações (para usá-lo como filtros de pesquisa), é recomendável adicionar um caractere - para separá-lo, para que a numeração automática funcione corretamente nos próximos projetos. Por exemplo %s-ABC. Você também pode preferir adicionar chaves de pesquisa ao marcador. Mas a melhor prática pode ser adicionar um campo dedicado, também chamado de atributos complementares.
 OpenedProjectsByThirdparties=Projetos abertos, por terceiros
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not open leads
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OnlyOpportunitiesShort=Apenas leva
+OpenedOpportunitiesShort=Ligações abertas
+NotOpenedOpportunitiesShort=Leads não abertos
+NotAnOpportunityShort=Não é um lead
+OpportunityTotalAmount=Quantidade total de leads
+OpportunityPonderatedAmount=Quantidade ponderada de leads
+OpportunityPonderatedAmountDesc=Leva quantidade ponderada com probabilidade
 OppStatusPROSP=Prospeção
 OppStatusQUAL=Qualificação
 OppStatusPROPO=Orçamento
@@ -220,17 +220,17 @@ OppStatusPENDING=Pendente
 OppStatusWON=Ganho
 OppStatusLOST=Perdido
 Budget=Orçamento
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
-LatestProjects=Latest %s projects
+AllowToLinkFromOtherCompany=Permitir vincular projeto de outra empresa <br> <br> <u> Valores suportados: </ u> <br> - Manter vazio: pode vincular qualquer projeto da empresa (padrão) <br> - "todos": pode vincular todos os projetos, até mesmo projeto de outras empresas <br> - Uma lista de ID de terceiros separada com vírgulas: pode vincular todos os projetos desses terceiros definidos (Exemplo: 123,4795,53) <br>
+LatestProjects=Últimos projetos %s
 LatestModifiedProjects=Últimos %s projetos modificados 
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
+OtherFilteredTasks=Outras tarefas filtradas
+NoAssignedTasks=Nenhuma tarefa atribuída (atribua projeto / tarefas ao usuário atual na caixa de seleção superior para inserir a hora nele)
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+AllowCommentOnTask=Permitir comentários de usuários sobre tarefas
+AllowCommentOnProject=Permitir comentários de usuários em projetos
+DontHavePermissionForCloseProject=Você não tem permissão para fechar o projeto %s
 DontHaveTheValidateStatus=O projeto %s deve estar ativo para ser desativado
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Payment of employee wages' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is suggested
+RecordsClosed=%s projeto (s) fechado (s)
+SendProjectRef=Projeto de informação %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=O módulo 'Pagamento dos salários dos empregados' deve estar habilitado para definir a taxa horária do empregado para ter o tempo gasto valorizado
+NewTaskRefSuggested=Tarefa ref já usada, uma nova tarefa ref é sugerida
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index f2837c61104..be81e8fedb3 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Assinado (por faturar)
 PropalStatusNotSigned=Sem Assinar (Fechado)
 PropalStatusBilled=Faturado
 PropalStatusDraftShort=Rascunho
-PropalStatusValidatedShort=Validado
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Fechado
 PropalStatusSignedShort=Assinado
 PropalStatusNotSignedShort=Não assinado
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Orçamento %s Inexistente
 AddToDraftProposals=Adicionar ao orçamento rascunho
 NoDraftProposals=Sem orçamentos rascunhos
 CopyPropalFrom=Criar orçamento, copiando um orçamento existente
-CreateEmptyPropal=Criar orçamentos a partir da lista de produtos/serviços
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Prazo de validade predefinido do orçamento (em dias)
-UseCustomerContactAsPropalRecipientIfExist=Utilizar morada de contacto de cliente, se definido em vez da morada de terceiro como morada de destinatário do orçamento
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clonar orçamento
 ConfirmClonePropal=Tem a certeza que pretende clonar o orçamento <b>%s</b>?
 ConfirmReOpenProp=Tem a certeza que pretende reabrir o orçamento <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Contacto do cliente que dá seguimento ao o
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Um modelo de orçamento completo (logótipo...)
+DocModelCyanDescription=Um modelo de orçamento completo (logótipo...)
 DefaultModelPropalCreate=Criação do modelo padrão
 DefaultModelPropalToBill=Modelo predefinido quando fechar um orçamento (a faturar)
 DefaultModelPropalClosed=Modelo predefinido quando fechar um orçamento (não faturado)
diff --git a/htdocs/langs/pt_PT/receiptprinter.lang b/htdocs/langs/pt_PT/receiptprinter.lang
index e1d460b6b9f..c5b478c4175 100644
--- a/htdocs/langs/pt_PT/receiptprinter.lang
+++ b/htdocs/langs/pt_PT/receiptprinter.lang
@@ -7,10 +7,10 @@ TestSentToPrinter=Teste Enviado para a Impressora %s
 ReceiptPrinter=Impressoras de recibo
 ReceiptPrinterDesc=Configurar impressoras de recibo
 ReceiptPrinterTemplateDesc=Configuração de Modelos
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ReceiptPrinterTypeDesc=Descrição do tipo de Impressora de Recibo
+ReceiptPrinterProfileDesc=Descrição do Perfil da Impressora de Recibos
 ListPrinters=Lista de Impressoras
-SetupReceiptTemplate=Template Setup
+SetupReceiptTemplate=Configuração de Modelo
 CONNECTOR_DUMMY=Impressora de Teste
 CONNECTOR_NETWORK_PRINT=Impressora de Rede
 CONNECTOR_FILE_PRINT=Impressora Local
@@ -23,12 +23,12 @@ PROFILE_DEFAULT=Perfil Predefinido
 PROFILE_SIMPLE=Perfil Simples
 PROFILE_EPOSTEP=Epos Tep Profile
 PROFILE_P822D=Perfil P822D
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile Help
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
+PROFILE_STAR=Perfil da Estrela
+PROFILE_DEFAULT_HELP=Perfil predefinido adequado para as impressoras Epson
+PROFILE_SIMPLE_HELP=Perfil simples sem gráficos
+PROFILE_EPOSTEP_HELP=Epos Tep Profile Ajuda
+PROFILE_P822D_HELP=Perfil do P822D sem gráficos
+PROFILE_STAR_HELP=Perfil da Estrela
 DOL_ALIGN_LEFT=Texto alinhado à esquerda
 DOL_ALIGN_CENTER=Texto centrado
 DOL_ALIGN_RIGHT=Texto alinhado à direita
@@ -37,8 +37,8 @@ DOL_USE_FONT_B=Utilizar letra B da Impressora
 DOL_USE_FONT_C=Utilizar letra C da Impressora
 DOL_PRINT_BARCODE=Imprimir código de barras
 DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimir código de barras da id. do cliente
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_CUT_PAPER_FULL=Cortar bilhete completamente
+DOL_CUT_PAPER_PARTIAL=Cortar ticket parcialmente
 DOL_OPEN_DRAWER=Abrir gaveta do dinheiro
 DOL_ACTIVATE_BUZZER=Ativar campainha
 DOL_PRINT_QRCODE=Imprimir Código QR
diff --git a/htdocs/langs/pt_PT/sms.lang b/htdocs/langs/pt_PT/sms.lang
index 3df936b6a06..facdadb0279 100644
--- a/htdocs/langs/pt_PT/sms.lang
+++ b/htdocs/langs/pt_PT/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
-SmsSetup=Configurar Sms
-SmsDesc=Esta página permite que você defina opções globais de SMS ou características
+SmsSetup=Configuração de SMS
+SmsDesc=Esta página permite definir opções globais em recursos do SMS
 SmsCard=Ficha de SMS
-AllSms=Todos Campanhas SMS
+AllSms=Todas as campanhas de SMS
 SmsTargets=Metas
 SmsRecipients=Metas
 SmsRecipient=Alvo
@@ -13,20 +13,20 @@ SmsTo=Alvo
 SmsTopic=Tópico de SMS
 SmsText=Mensagem
 SmsMessage=Mensagem SMS
-ShowSms=Mostrar Sms
-ListOfSms=Lista SMS Campanhas
-NewSms=Nova Campanha SMS
-EditSms=Editar Sms
+ShowSms=Mostrar SMS
+ListOfSms=Listar campanhas de SMS
+NewSms=Nova campanha de SMS
+EditSms=Editar SMS
 ResetSms=Envio Novo
-DeleteSms=Apagar Sms campain
-DeleteASms=Remover uma Campanha Sms
-PreviewSms=Prever Sms
-PrepareSms=Prepare Sms
-CreateSms=Criar Sms
-SmsResult=Resultado de envio de SMS
-TestSms=Teste Sms
-ValidSms=Validar Sms
-ApproveSms=Aprovar Sms
+DeleteSms=Excluir campanha de SMS
+DeleteASms=Remover uma campanha de SMS
+PreviewSms=SMS Previuw
+PrepareSms=Prepare SMS
+CreateSms=Criar SMS
+SmsResult=Resultado do envio de SMS
+TestSms=Teste de SMS
+ValidSms=Validar SMS
+ApproveSms=Aprovar SMS
 SmsStatusDraft=Rascunho
 SmsStatusValidated=Validado
 SmsStatusApproved=Aprovado
@@ -35,16 +35,16 @@ SmsStatusSentPartialy=Enviado parcialmente
 SmsStatusSentCompletely=Enviado completamente
 SmsStatusError=Erro
 SmsStatusNotSent=Não enviado
-SmsSuccessfulySent=Sms enviada corretamente (de %s a %s)
+SmsSuccessfulySent=SMS enviado corretamente (de %s para %s)
 ErrorSmsRecipientIsEmpty=Número de destino está vazio
 WarningNoSmsAdded=Novo número de telefone para adicionar à lista de alvos
-ConfirmValidSms=Confirma a validação desta campanha? 
-NbOfUniqueSms=Nb DOF únicos números de telefone
-NbOfSms=Nbre de números phon
+ConfirmValidSms=Você confirma a validação desta campanha?
+NbOfUniqueSms=Não. De números de telefone exclusivos
+NbOfSms=Número de números de telefone
 ThisIsATestMessage=Esta é uma mensagem de teste
 SendSms=Enviar SMS
-SmsInfoCharRemain=N º de caracteres restantes
-SmsInfoNumero= (Formato internacional exemplo: +33899701761)
+SmsInfoCharRemain=No. de caracteres restantes
+SmsInfoNumero= (formato internacional, ou seja: +33899701761)
 DelayBeforeSending=Atraso antes de enviar (minutos)
 SmsNoPossibleSenderFound=Nenhum operador disponível. Verifique a configuração do seu serviço SMS. 
 SmsNoPossibleRecipientFound=Nenhum alvo disponível. Verifique a configuração do seu provedor de SMS.
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index d03c7f1022f..029f564a5b1 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -3,9 +3,9 @@ WarehouseCard=Ficha do armazém
 Warehouse=Armazém
 Warehouses=Armazéns
 ParentWarehouse=Armazém Principal
-NewWarehouse=Novo Armazem ou Zona de Armazenagem
+NewWarehouse=Novo armazém / área de stock
 WarehouseEdit=Modificar armazém
-MenuNewWarehouse=Novo Armazem
+MenuNewWarehouse=Novo armazém
 WarehouseSource=Armazem Origem
 WarehouseSourceNotDefined=Sem armazém definido
 AddWarehouse=Criar armazém
@@ -17,7 +17,7 @@ CancelSending=Cancelar Envío
 DeleteSending=Eliminar Envío
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stocks by lot/serial
+StocksByLotSerial=Stocks por lote/número de série
 LotSerial=Lotes / Nr. Série
 LotSerialList=Lista de lote / nr. série
 Movements=Movimentos
@@ -27,71 +27,70 @@ ListOfStockMovements=Lista de movimentos de stock
 ListOfInventories=Lista de inventários
 MovementId=Id. do Movimento
 StockMovementForId=Id. do Movimento %d
-ListMouvementStockProject=List of stock movements associated to project
+ListMouvementStockProject=Lista de movimentos de estoque associados ao projeto
 StocksArea=Área de armazéns
 Location=Localização
 LocationSummary=Nome abreviado da localização
 NumberOfDifferentProducts=Número de produtos diferentes
 NumberOfProducts=Numero total de produtos
 LastMovement=Movimentos mais recentes
-LastMovements=Latest movements
+LastMovements=Últimos movimentos
 Units=Unidades
 Unit=Unidade
-StockCorrection=Stock correction
+StockCorrection=Correção de estoque
 CorrectStock=Correcção stock
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-LabelMovement=Movement label
+StockTransfer=Transferência de estoque
+TransferStock=Estoque de transferência
+MassStockTransferShort=Transferência de estoque em massa
+StockMovement=Movimentação de estoque
+StockMovements=Movimentos de estoque
 NumberOfUnit=Número de peças
 UnitPurchaseValue=Preço de compra Unitário
 StockTooLow=Stock insuficiente
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Estoque inferior ao limite de alerta (%s)
 EnhancedValue=Valor
 PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+UserWarehouseAutoCreate=Crie um armazém de usuários automaticamente ao criar um usuário
+AllowAddLimitStockByWarehouse=Permitir adicionar limite e estoque desejado por par (produto, armazém) em vez de por produto
+IndependantSubProductStock=Estoque de produto e subproduto são independentes
 QtyDispatched=Quantidade desagregada
 QtyDispatchedShort=Qt. despachada
 QtyToDispatchShort=Qt. a despachar
 OrderDispatch=Receção da encomenda
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Diminuir stocks reais ao validar faturas/notas de crédito de clientes
-DeStockOnValidateOrder=Diminuir stocks reais ao validar encomendas para clientes
+RuleForStockManagementDecrease=Escolha Regra para redução automática de estoque (a redução manual é sempre possível, mesmo se uma regra de redução automática estiver ativada)
+RuleForStockManagementIncrease=Escolha Regra para aumento automático de estoque (o aumento manual é sempre possível, mesmo se uma regra de aumento automático estiver ativada)
+DeStockOnBill=Diminuir estoques reais na validação da fatura / nota de crédito do cliente
+DeStockOnValidateOrder=Diminuir estoques reais na validação do pedido do cliente
 DeStockOnShipment=Diminuir stocks reais ao validar a expedição
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Incrementar os stocks físicos ao validar faturas/recibos
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Diminuir estoques reais na classificação de remessa fechada
+ReStockOnBill=Aumentar os estoques reais na validação da fatura / nota de crédito do fornecedor
+ReStockOnValidateOrder=Aumentar estoques reais na aprovação do pedido
+ReStockOnDispatchOrder=Aumentar estoques reais no envio manual para o depósito, após o recebimento do pedido pelo fornecedor
 OrderStatusNotReadyToDispatch=A encomenda não está pronta para o despacho dos produtos no stock dos armazéns.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=Explicação da diferença entre estoque físico e virtual
 NoPredefinedProductToDispatch=Nenhum produto predefinido para este objeto. Portanto, não é necessário enviar despachos em stock.
 DispatchVerb=Expedição
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitShort=Limite para alerta
+StockLimit=Limite de estoque para alerta
+StockLimitDesc=(vazio) significa que não há aviso. <br> 0 pode ser usado para um aviso assim que o estoque estiver vazio.
 PhysicalStock=Stock físico
 RealStock=Stock real
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=O estoque físico ou real é o estoque que você tem atualmente em seus armazéns / locais internos.
+RealStockWillAutomaticallyWhen=O estoque real será alterado automaticamente de acordo com essas regras (consulte a configuração do módulo de estoque para alterar isso):
 VirtualStock=Stock virtual
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=O estoque virtual é o estoque que você receberá uma vez que todas as ações pendentes abertas que afetam os estoques serão fechadas (pedido do fornecedor recebido, pedido do cliente enviado, ...)
 IdWarehouse=Id. armazem
 DescWareHouse=Descrição armazem
 LieuWareHouse=Localização armazem
 WarehousesAndProducts=Armazens e produtos
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=Armazéns e produtos (com detalhe por lote / série)
 AverageUnitPricePMPShort=Média dos preços de entrada
 AverageUnitPricePMP=Média dos preços de entrada
 SellPriceMin=Vendendo Preço unitário
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
+EstimatedStockValueSellShort=Valor para vender
+EstimatedStockValueSell=Valor para vender
 EstimatedStockValueShort=Valor estimado de stock
 EstimatedStockValue=Valor estimado de stock
 DeleteAWarehouse=Excluir um armazém
@@ -100,107 +99,112 @@ PersonalStock=Pessoal %s stock
 ThisWarehouseIsPersonalStock=Este armazém representa stock pessoal de %s %s
 SelectWarehouseForStockDecrease=Escolha depósito a ser usado para diminuição de ações
 SelectWarehouseForStockIncrease=Escolha depósito a ser usado para aumentar stock
-NoStockAction=No stock action
-DesiredStock=Desired optimal stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
+NoStockAction=Nenhuma ação de estoque
+DesiredStock=Estoque ideal desejado
+DesiredStockDesc=Esse valor do estoque será o valor usado para preencher o estoque pelo recurso de reabastecimento.
+StockToBuy=Pedir
+Replenishment=Reabastecimento
+ReplenishmentOrders=Ordens de reabastecimento
+VirtualDiffersFromPhysical=De acordo com as opções de aumento / redução de estoque, o estoque físico e o estoque virtual (pedidos físicos + atuais) podem diferir
+UseVirtualStockByDefault=Usar estoque virtual por padrão, em vez de estoque físico, para o recurso de reabastecimento
+UseVirtualStock=Use estoque virtual
+UsePhysicalStock=Use estoque físico
+CurentSelectionMode=Modo de seleção atual
 CurentlyUsingVirtualStock=Stock virtual
 CurentlyUsingPhysicalStock=Stock físico
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+RuleForStockReplenishment=Regra para reabastecimento de estoques
+SelectProductWithNotNullQty=Selecione pelo menos um produto com uma quantidade não nula e um fornecedor
 AlertOnly= Só Alertas
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+WarehouseForStockDecrease=O depósito <b> %s </ b> será usado para redução de estoque
+WarehouseForStockIncrease=O depósito <b> %s </ b> será usado para aumentar o estoque
 ForThisWarehouse=Para este armazém
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfer
+ReplenishmentStatusDesc=Esta é uma lista de todos os produtos com um estoque menor do que o estoque desejado (ou menor que o valor de alerta, se a caixa de seleção "somente alerta" estiver marcada). Usando a caixa de seleção, você pode criar pedidos de fornecedores para preencher a diferença.
+ReplenishmentOrdersDesc=Esta é uma lista de todos os pedidos de fornecedores abertos, incluindo produtos predefinidos. Somente pedidos abertos com produtos predefinidos, portanto, os pedidos que podem afetar os estoques são visíveis aqui.
+Replenishments=Reabastecimentos
+NbOfProductBeforePeriod=Quantidade de produto %s em estoque antes do período selecionado (<%s)
+NbOfProductAfterPeriod=Quantidade de produto %s em estoque após o período selecionado (> %s)
+MassMovement=Movimento de massa
+SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um warehouse de origem e um warehouse de destino e clique em "%s". Assim que isso for feito para todos os movimentos necessários, clique em "%s".
+RecordMovement=Transferência de registro
 ReceivingForSameOrder=Receções para esta encomenda
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
-MovementLabel=Label of movement
-DateMovement=Date of movement
+StockMovementRecorded=Movimentos de estoque registrados
+RuleForStockAvailability=Regras sobre requisitos de estoque
+StockMustBeEnoughForInvoice=O nível de estoque deve ser suficiente para adicionar produto / serviço à fatura (a verificação é feita no estoque real atual ao adicionar uma linha na fatura, qualquer que seja a regra para a modificação automática de estoque)
+StockMustBeEnoughForOrder=O nível de estoque deve ser suficiente para adicionar produto / serviço à ordem (a verificação é feita no estoque real atual ao adicionar uma linha à ordem, qualquer que seja a regra para a troca automática de estoque)
+StockMustBeEnoughForShipment= O nível de estoque deve ser suficiente para adicionar produto / serviço ao embarque (a verificação é feita no estoque real atual ao adicionar uma linha ao embarque, qualquer que seja a regra para a troca automática de estoque)
+MovementLabel=Rótulo de movimento
+TypeMovement=Tipo de movimento
+DateMovement=Data de movimento
 InventoryCode=Movimento ou código do inventário
-IsInPackage=Contained into package
+IsInPackage=Contido no pacote
 WarehouseAllowNegativeTransfer=O stock pode ser negativo
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Você não tem estoque suficiente do seu depósito de origem e sua configuração não permite estoques negativos.
 ShowWarehouse=Mostrar armazém
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
+MovementCorrectStock=Correção de estoque para o produto %s
+MovementTransferStock=Transferência de estoque do produto %s para outro depósito
+InventoryCodeShort=Inv./Mov. código
+NoPendingReceptionOnSupplierOrder=Não há recepção pendente devido a pedido de fornecedor aberto
+ThisSerialAlreadyExistWithDifferentDate=Este lote / número de série (<strong> %s </ strong>) já existe, mas com data diferente de eatby ou sellby (encontrado <strong> %s </ strong>, mas você insere <strong> %s </ strong>).
+OpenAll=Aberto para todas as ações
+OpenInternal=Aberto somente para ações internas
+UseDispatchStatus=Usar um status de despacho (aprovar / recusar) para linhas de produtos na recepção de pedidos do fornecedor
+OptionMULTIPRICESIsOn=A opção "vários preços por segmento" está ativada. Isso significa que um produto tem vários preços de venda, portanto, o valor para venda não pode ser calculado
+ProductStockWarehouseCreated=Limite de estoque para estoque ideal de alerta e desejado criado corretamente
+ProductStockWarehouseUpdated=Limite de estoque para estoque ótimo de alerta e desejado atualizado corretamente
+ProductStockWarehouseDeleted=Limite de estoque para alerta e estoque ideal desejado corretamente excluídos
+AddNewProductStockWarehouse=Definir novo limite para alerta e estoque ideal desejado
+AddStockLocationLine=Diminuir quantidade, em seguida, clique para adicionar outro armazém para este produto
+InventoryDate=Data de Inventário
+NewInventory=Novo inventário
+inventorySetup = Configuração de Inventário
+inventoryCreatePermission=Criar novo inventário
+inventoryReadPermission=Visualizar inventários
+inventoryWritePermission=Atualizar inventários
 inventoryValidatePermission=Validar inventário
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+inventoryTitle=Inventário
+inventoryListTitle=Os inventários
+inventoryListEmpty=Nenhum inventário em andamento
+inventoryCreateDelete=Criar / Excluir inventário
+inventoryCreate=Crie um novo
 inventoryEdit=Editar
 inventoryValidate=Validado
 inventoryDraft=Em Serviço
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Escolha do armazém
 inventoryConfirmCreate=Criar
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=Inventário para depósito: %s
+inventoryErrorQtyAdd=Erro: uma quantidade é menor que zero
+inventoryMvtStock=Por inventário
+inventoryWarningProductAlreadyExists=Este produto já está na lista
 SelectCategory=Filtro por categoría
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+SelectFournisseur=Filtro de fornecedores
+inventoryOnDate=Inventário
+INVENTORY_DISABLE_VIRTUAL=Permitir não desmontar produto filho de um kit no inventário
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use o preço de compra se não for possível encontrar o último preço de compra
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Movimento de estoque tem data de inventário
+inventoryChangePMPPermission=Permitir alterar o valor do PMP para um produto
+ColumnNewPMP=Nova unidade PMP
+OnlyProdsInStock=Não adicione produto sem estoque
+TheoricalQty=Teorique qty
+TheoricalValue=Teorique qty
+LastPA=Último BP
+CurrentPA=PB de Curadoria
+RealQty=Qtd Real
+RealValue=Valor real
+RegulatedQty=Quantidade Registada
+AddInventoryProduct=Adicionar produto ao inventário
 AddProduct=Adicionar
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=Aplicar PMP
+FlushInventory=Inventário nivelado
+ConfirmFlushInventory=Você confirma esta ação?
+InventoryFlushed=Inventário lavado
+ExitEditMode=Edição de saída
 inventoryDeleteLine=Apagar a linha
-RegulateStock=Regulate Stock
+RegulateStock=Regular estoque
 ListInventory=Lista
-StockSupportServices=Stock management support services
-StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
-ReceiveProducts=Receive items
+StockSupportServices=Gestão de stocks suporta serviços
+StockSupportServicesDesc=Por padrão, você pode estocar somente produtos com o tipo "produto". Se ativado, e se o serviço de módulo estiver ativado, também é possível estocar um produto com o tipo "serviço"
+ReceiveProducts=Receber itens
+StockIncreaseAfterCorrectTransfer=Aumentar por correção / transferência
+StockDecreaseAfterCorrectTransfer=Diminuir pela correção / transferência
+StockIncrease=Aumento de estoque
+StockDecrease=Redução de estoque
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index d94cf0d0e4e..9600d2dd78f 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configurar módulo de Stripe
-StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Módulo para oferecer uma página de pagamento on-line que aceita pagamentos com cartão de crédito / débito via <a href="http://www.stripe.com" target="_blank"> Listra </a>. Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, ordem, ...)
 StripeOrCBDoPayment=Pagar com cartão de crédito ou Stripe
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
 PaymentForm=Forma de pagamento
-WelcomeOnPaymentPage=Bem-vindo aos nossos serviços de pagamento online
+WelcomeOnPaymentPage=Bem-vindo ao nosso serviço de pagamento online
 ThisScreenAllowsYouToPay=Esta tela permite que você faça o seu pagamento online destinado a %s.
 ThisIsInformationOnPayment=Aqui estão as informações de pagamento para fazer
 ToComplete=A completar
@@ -23,43 +23,42 @@ ToOfferALinkForOnlinePaymentOnFreeAmount=URL que fornece pagamento on-line %s in
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL para oferecer uma interface on-line %s pagamento de uma subscrição de membro
 YouCanAddTagOnUrl=Você também pode adicionar o parâmetro url <b>&tag=<i>value</i></b>  para o endereço (exigida apenas para o pagamento livre) para ver o seu código próprio, observação do pagamento.
 SetupStripeToHavePaymentCreatedAutomatically=Configure o seu Stripe através do URL <b>%s</b> para que tenha os pagamentos criados automaticamente quando estes forem validades pelo Stripe.
-YourPaymentHasBeenRecorded=Esta página confirma que o pagamento tenha sido gravada. Obrigado.
-YourPaymentHasNotBeenRecorded=Você o pagamento não tenha sido gravada e transação foi cancelada. Obrigado.
 AccountParameter=Conta parâmetros
 UsageParameter=Parâmetros de uso
 InformationToFindParameters=Ajuda para encontrar informações de sua conta %s
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+STRIPE_CGI_URL_V2=Módulo Url of Stripe CGI para pagamento
 VendorName=Nome do fornecedor
 CSSUrlForPaymentForm=CSS url folha de estilo para forma de pagamento
 NewStripePaymentReceived=Novo pagamento Stripe recebido
 NewStripePaymentFailed=Nova tentativa de pagamento Stripo, mas falhou
 STRIPE_TEST_SECRET_KEY=Chave de teste secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Chave de teste publicável
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+STRIPE_TEST_WEBHOOK_KEY=Chave de teste Webhook
+STRIPE_LIVE_SECRET_KEY=Chave viva secreta
+STRIPE_LIVE_PUBLISHABLE_KEY=Chave ao vivo publicável
+STRIPE_LIVE_WEBHOOK_KEY=Chave ao vivo do Webhook
+ONLINE_PAYMENT_WAREHOUSE=Estoque a ser usado para redução de estoque quando o pagamento on-line é feito <br> (TODO Quando a opção para diminuir o estoque é feita em uma ação na fatura e o pagamento on-line gera a fatura em si?)
+StripeLiveEnabled=Stripe live enabled (caso contrário, modo de teste / sandbox)
+StripeImportPayment=Importar pagamentos de tarja
+ExampleOfTestCreditCard=Exemplo de cartão de crédito para teste: %s (válido), %s (erro CVC), %s (expirado), %s (falha de carga)
+StripeGateways=Gateways listra
+OAUTH_STRIPE_TEST_ID=ID do cliente do Stripe Connect (ca _...)
+OAUTH_STRIPE_LIVE_ID=ID do cliente do Stripe Connect (ca _...)
+BankAccountForBankTransfer=Conta bancária para pagamentos de fundos
+StripeAccount=Conta da listra
+StripeChargeList=Lista de cobranças do Stripe
+StripeTransactionList=Lista de transações de faixa
+StripeCustomerId=ID do cliente de faixa
+StripePaymentModes=Modos de pagamento tarja
+LocalID=Id. Local
+StripeID=ID da faixa
+NameOnCard=Nome no cartão
+CardNumber=Número do Cartão
+ExpiryDate=Data de Expiração
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+DeleteACard=Excluir cartão
+ConfirmDeleteCard=Tem certeza de que deseja excluir este cartão de crédito ou débito?
 CreateCustomerOnStripe=Criar cliente no Stripe
 CreateCardOnStripe=Criar ficha no Stripe
-ShowInStripe=Show in Stripe
+ShowInStripe=Mostrar na listra
+StripeUserAccountForActions=Conta de usuário para usar para alguns e-mails de notificação de eventos Stripe (pagamentos de faixa)
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 974fa46bc11..fa0a0e80f38 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -1,84 +1,95 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Código
-WebsiteSetupDesc=Crie aqui as entradas e o número de diferentes sites da Web que precisar. Depois vá ao menu de Sites da Web para editá-los.
+WebsiteSetupDesc=Crie aqui os sites que você deseja usar. Em seguida, vá para o menu Websites para editá-los.
 DeleteWebsite=Eliminar site da Web
-ConfirmDeleteWebsite=Tem a certeza que deseja eliminar este site da Web. Também irão ser removidos todas as suas páginas e conteúdo.
+ConfirmDeleteWebsite=Tem certeza de que deseja excluir este site? Todas as suas páginas e conteúdo também serão removidos.
 WEBSITE_TYPE_CONTAINER=Tipo de página / recipiente
 WEBSITE_PAGE_EXAMPLE=Página da Web para utilizar como exemplo
 WEBSITE_PAGENAME=Nome/pseudonimo da página
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALT=Nomes / aliases de páginas alternativos
+WEBSITE_ALIASALTDesc=Use aqui a lista de outros nomes / aliases para que a página também possa ser acessada usando esses outros nomes / aliases (por exemplo, o nome antigo depois de renomear o alias para manter o backlink no trabalho antigo de link / nome). A sintaxe é: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL do ficheiro CSS externo
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Ficheiro .htaccess de site da Web
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+WEBSITE_CSS_INLINE=Conteúdo do arquivo CSS (comum a todas as páginas)
+WEBSITE_JS_INLINE=Conteúdo do arquivo Javascript (comum a todas as páginas)
+WEBSITE_HTML_HEADER=Inclusão na parte inferior do cabeçalho HTML (comum a todas as páginas)
+WEBSITE_ROBOT=Arquivo Robot (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+HtmlHeaderPage=Cabeçalho HTML (especificar apenas para  esta página)
+PageNameAliasHelp=Nome ou alias da página. <br> Este alias também é usado para forjar uma URL SEO quando o site é executado a partir de um host virtual de um servidor Web (como Apacke, Nginx, ...). Use o botão "<strong> %s </ strong>" para editar este alias.
+EditTheWebSiteForACommonHeader=Nota: Se você quiser definir um cabeçalho personalizado para todas as páginas, edite o cabeçalho no nível do site em vez de na página / container.
 MediaFiles=Bliblioteca de Multimedia
-EditCss=Editar Estilo/CSS ou cabeçalho de HTML
+EditCss=Editar propriedades do site
 EditMenu=Editar Menu
-EditMedias=Edit medias
-EditPageMeta=Editar Metadados
+EditMedias=Editar mídias
+EditPageMeta=Editar propriedades de página / contêiner
+EditInLine=Editar em linha
 AddWebsite=Adicionar site da Web
 Webpage=Página/recipiente da Web
 AddPage=Adicionar página/recipiente
 HomePage=Página Inicial
 PageContainer=Página/recipiente
-PreviewOfSiteNotYetAvailable=A pré-visualização do seu site da Web <strong>%s</strong> ainda mão está disponível. Deve adicionar primeiro uma página.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong> %s </ strong> ainda não disponível. Você deve primeiro '<strong> Importar um modelo de site completo </ strong>' ou apenas '<strong> Adicionar uma página / contêiner </ strong>'.
+RequestedPageHasNoContentYet=Página solicitada com o ID %s ainda não tem conteúdo, ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
+SiteDeleted=Web site '%s' excluído
 PageContent=Página / Recipiente
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
+PageDeleted=Página / Contenair '%s' do site %s eliminado
+PageAdded=Page / Contenair '%s' adicionado
 ViewSiteInNewTab=Ver site no novo separador
 ViewPageInNewTab=Ver página no novo separador
-SetAsHomePage=Definir como página Inicial
+SetAsHomePage=Definir como página de 'Início'
 RealURL=URL Real
-ViewWebsiteInProduction=Ver site no utilizando URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+ViewWebsiteInProduction=Ver site da Web utilizando URLs de início
+SetHereVirtualHost=<u> Usar com Apache / NGinx /...</ u> <br> Se você pode criar, no seu servidor web (Apache, Nginx, ...), um Host Virtual dedicado com PHP habilitado e um diretório Root no <br> <strong> %s </ strong> <br> Em seguida, insira aqui o nome do host virtual que você criou, para que a visualização também possa ser feita usando esse acesso ao servidor Web dedicado, em vez de usar apenas o servidor Dolibarr.
+YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (requer PHP 5.5) executando <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
+CheckVirtualHostPerms=Verifique também se o host virtual tem permissão <strong> %s </ strong> em arquivos para o <strong> %s </ strong>
 ReadPerm=Ler
-WritePerm=Write
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Web site added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
-FetchAndCreate=Fetch and Create
-ExportSite=Export site
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Contas do website
-AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=Another container
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
+WritePerm=Escrever
+PreviewSiteServedByWebServer=<u> Pré-visualize %s num novo separador. </ u> <br> <br> O %s será servido por um servidor Web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL fornecida pelo servidor externo: <br> <strong> %s </ strong>
+PreviewSiteServedByDolibarr=<u> Prévia %s em uma nova aba. </ u> <br> <br> O %s será servido pelo servidor Dolibarr para que não seja necessário nenhum servidor web extra (como Apache, Nginx, IIS) para ser instalado. br> O inconveniente é que o URL das páginas não é de fácil utilização e começa com o caminho do seu Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </ strong> <br> <br> Use o seu próprio servidor web externo para servir este site, criar um host virtual em seu servidor web que aponte no diretório <br> <strong> %s </ strong> <br> em seguida, digite o nome deste servidor virtual e clique no outro botão de pré-visualização .
+VirtualHostUrlNotDefined=URL do host virtual servido pelo servidor da web externo não definido
+NoPageYet=Ainda sem páginas
+YouCanCreatePageOrImportTemplate=Você pode criar uma nova página ou importar um modelo de site completo
+SyntaxHelp=Ajuda em dicas de sintaxe específicas
+YouCanEditHtmlSourceckeditor=Você pode editar o código-fonte HTML usando o botão "Fonte" no editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+ClonePage=Página / contêiner clone
+CloneSite=Site clone
+SiteAdded=Website added
+ConfirmClonePage=Por favor digite o código / alias da nova página e se é uma tradução da página clonada.
+PageIsANewTranslation=A nova página é uma tradução da página atual?
+LanguageMustNotBeSameThanClonedPage=Você clona uma página como uma tradução. O idioma da nova página deve ser diferente do idioma da página de origem.
+ParentPageId=ID da página principal
+WebsiteId=ID do site
+CreateByFetchingExternalPage=Crie uma página / contêiner buscando página de um URL externo ...
+OrEnterPageInfoManually=Ou crie uma página do zero ou de um modelo de página ...
+FetchAndCreate=Buscar e criar
+ExportSite=Site de exportação
+ImportSite=Importar modelo de site
+IDOfPage=Id da página
+Banner=Bandeira
+BlogPost=Postagem no blog
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Crie uma conta do site
+BackToListOfThirdParty=Voltar para lista de terceiros
+DisableSiteFirst=Desativar primeiro site
+MyContainerTitle=Meu título do site
+AnotherContainer=Outro recipiente
+WEBSITE_USE_WEBSITE_ACCOUNTS=Ativar a tabela de contas do site
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ativar a tabela para armazenar contas do site (login / pass) para cada site / terceiro
+YouMustDefineTheHomePage=Primeiro deve definir a página de Início predefinida
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+OnlyEditionOfSourceForGrabbedContent=Somente edição de fonte HTML é possível quando o conteúdo foi obtido de um site externo
+GrabImagesInto=Pegue também imagens encontradas em css e página.
+ImagesShouldBeSavedInto=As imagens devem ser salvas no diretório
+WebsiteRootOfImages=Diretório raiz para imagens de sites
+SubdirOfPage=Subdiretório dedicado à página
+AliasPageAlreadyExists=A página de alias <strong> %s </ strong> já existe
+CorporateHomePage=Página de Início da Empresa
+EmptyPage=Página vazia
+ExternalURLMustStartWithHttp=O URL externo deve começar com http: // ou https: //
+ZipOfWebsitePackageToImport=Arquivo zip do pacote do site
+ShowSubcontainers=Incluir conteúdo dinâmico
+InternalURLOfPage=URL interno da página
+ThisPageIsTranslationOf=Esta página / container é tradução de
+ThisPageHasTranslationPages=Esta página / contêiner tem tradução
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 4946c432c0f..2b25184b8ad 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -7,14 +7,14 @@ NewStandingOrder=Nova ordem de pagamento de débito direto
 StandingOrderToProcess=Para processar
 WithdrawalsReceipts=Encomenda de débito direto
 WithdrawalReceipt=Encomenda de Débito Direto
-LastWithdrawalReceipts=Latest %s direct debit files
+LastWithdrawalReceipts=Últimos arquivos de débito direto %s
 WithdrawalsLines=Linhas de ordem de débito direto
-RequestStandingOrderToTreat=Request for direct debit payment order to process
-RequestStandingOrderTreated=Request for direct debit payment order processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
+RequestStandingOrderToTreat=Pedido para ordem de pagamento por débito direto a processar
+RequestStandingOrderTreated=Pedido de ordem de pagamento por débito direto processado
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
+NbOfInvoiceToWithdraw=N.º de fatura qualificada com pedido de débito direto em espera
+NbOfInvoiceToWithdrawWithInfo=Nº de fatura do cliente com ordens de pagamento por débito direto com informações definidas sobre a conta bancária
+InvoiceWaitingWithdraw=Fatura a aguardar por débito direto
 AmountToWithdraw=Quantidade a Levantar
 WithdrawsRefused=Débito direto recusado
 NoInvoiceToWithdraw=Não existe nenhuma fatura à espera com 'Pedidos de débito direto' abertos. Vá ao separador '%s' na ficha da fatura para fazer um pedido.
@@ -22,13 +22,13 @@ ResponsibleUser=Utilizador Responsável dos Débitos Directos
 WithdrawalsSetup=Configurar pagamento de débito direto
 WithdrawStatistics=Estatísticas de pagamento de débito direto
 WithdrawRejectStatistics=Estatísticas de pagamento de débito direto rejeitado
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-WithdrawRequestsDone=%s direct debit payment requests recorded
+LastWithdrawalReceipt=Últimos recibos de débito direto %s
+MakeWithdrawRequest=Efetuar um pedido de pagamento por débito direto
+WithdrawRequestsDone=Pedidos de pagamento por débito direto %s registrados
 ThirdPartyBankCode=Código Banco do Terceiro
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
 ClassCredited=Classificar como creditado
-ClassCreditedConfirm=Está seguro de querer classificar este débito directo como realizado sobre a sua conta bancaria?
+ClassCreditedConfirm=Tem a certeza que quer classificar este débito direto como creditado na sua conta bancária?
 TransData=Data de Envio
 TransMetod=Método de transmissão
 Send=Enviar
@@ -40,7 +40,7 @@ RefusedData=Data de rejeição
 RefusedReason=Motivo da rejeição
 RefusedInvoicing=Faturação da rejeição
 NoInvoiceRefused=Não cobrar a rejeição
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Fatura recusada (cobrar a rejeição ao cliente)
 StatusDebitCredit=Estado do débito/crédito
 StatusWaiting=Em espera
 StatusTrans=Enviado
@@ -55,9 +55,9 @@ StatusMotif5=RIB inutilizável
 StatusMotif6=Conta sem saldo
 StatusMotif7=Decisão Judicial
 StatusMotif8=Outro motivo
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateForSepaFRST=Criar arquivo de débito direto (SEPA FRST)
+CreateForSepaRCUR=Criar arquivo de débito direto (SEPA RCUR)
+CreateAll=Criar arquivo de débito direto (todos)
 CreateGuichet=Apenas escritório
 CreateBanque=Apenas banco
 OrderWaiting=À espera de tratamento
@@ -66,49 +66,49 @@ NotifyCredit=levantamento de crédito
 NumeroNationalEmetter=Número Nacional de Transmissor
 WithBankUsingRIB=Para contas bancárias usando RIB
 WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Conta bancária para receber débito direto
 CreditDate=Crédito em
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Não é possível gerar o arquivo de recibo de retirada para o seu país %s (Seu país não é suportado)
 ShowWithdraw=Mostrar levantamento
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se a fatura tiver pelo menos um pagamento ainda não processado, não será definida como paga para permitir o gestão do pagamento anterior.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem de pagamento por débito direto. Uma vez feito, entre no menu Banco-> Débito Direto para administrar a ordem de pagamento por débito direto. Quando a ordem de pagamento é encerrada, o pagamento na fatura será registrado automaticamente e a fatura será encerrada se o restante a pagar for nulo.
 WithdrawalFile=arquivo retirado
 SetToStatusSent=Definir o estado como "Ficheiro Enviado"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
+ThisWillAlsoAddPaymentOnInvoice=Isso também registrará os pagamentos para as faturas e os classificará como "Pago" se o restante a pagar for nulo
+StatisticsByLineStatus=Estatísticas por status de linhas
 RUM=UMR
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor’s Name
-SEPAFillForm=(B) Please complete all the fields marked *
+RUMLong=Referência de mandato exclusivo
+RUMWillBeGenerated=Se estiver vazio, o número de UMR será gerado assim que as informações da conta bancária forem salvas
+WithdrawMode=Modo de débito direto (FRST ou RECUR)
+WithdrawRequestAmount=Quantidade de solicitação de débito direto:
+WithdrawRequestErrorNilAmount=Não é possível criar um pedido de débito direto para o valor vazio.
+SepaMandate=Mandato de Débito Direto SEPA
+SepaMandateShort=Mandato SEPA
+PleaseReturnMandate=Por favor, devolva este formulário de mandato por e-mail para %s ou por e-mail para
+SEPALegalText=Ao assinar este formulário de mandato, você autoriza (A) %s a enviar instruções ao seu banco para debitar sua conta e (B) seu banco a debitar sua conta de acordo com as instruções de %s. Como parte de seus direitos, você tem direito a um reembolso de seu banco, de acordo com os termos e condições de seu contrato com seu banco. Um reembolso deve ser solicitado no prazo de oito semanas a partir da data em que sua conta foi debitada. Seus direitos em relação ao mandato acima são explicados em uma declaração que você pode obter do seu banco.
+CreditorIdentifier=Identificador do Credor
+CreditorName=Nome do Credor
+SEPAFillForm=(B) Por favor, preencha todos os campos marcados com *
 SEPAFormYourName=O seu nome
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+SEPAFormYourBAN=O nome da sua conta bancária (IBAN)
+SEPAFormYourBIC=Seu código de identificação bancária (BIC)
+SEPAFrstOrRecur=Tipo de pagamento
+ModeRECUR=Pagamento Recorrente
+ModeFRST=Pagamento único
+PleaseCheckOne=Por favor, marque apenas um
+DirectDebitOrderCreated=Ordem de débito direto %s criada
+AmountRequested=Quantidade solicitada
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
+ExecutionDate=Data de execução
 CreateForSepa=Criar ficheiro de débito direto
 
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=Pagamento da ordem de pagamento de débito direto %s pelo banco
+InfoCreditMessage=A ordem de pagamento por débito directo %s foi paga pelo banco <br> Dados do pagamento: %s
+InfoTransSubject=Transmissão da ordem de pagamento de débito direto %s para o banco
+InfoTransMessage=A ordem de pagamento por débito directo %s foi enviada para o banco por %s %s. <br> <br>
 InfoTransData=Valor: %s <br> Metode: %s <br> Data: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectSubject=Pedido de pagamento por débito direto recusado
+InfoRejectMessage=Olá, <br> <br> a ordem de pagamento de débito directo da factura  %s relacionada com a empresa %s, com uma quantidade de %s foi recusada pelo banco. <br> <br> <br> <br>%s
 ModeWarning=Opção para o modo real não foi definido, nós paramos depois desta simulação
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index 2205f9d76fa..e2fe241392b 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configurar módulo de fluxo de frabalho
-WorkflowDesc=Este módulo foi criado para modificar o comportamento das ações automáticas na aplicação. Por predefinição, o fluxo de trabalho está aberto (pode fazer as coisas na ordem que desejar). Pode ativar as ações automáticas em que está interessado.
+WorkflowDesc=Este módulo fornece algumas ações automáticas. Por padrão, o fluxo de trabalho é aberto (você pode fazer as coisas na ordem desejada), mas aqui você pode ativar algumas ações automáticas.
 ThereIsNoWorkflowToModify=Não há modificações de fluxo de trabalho disponíveis para os módulos ativados.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma encomenda de cliente após a assinatura de um orçamento (a nova encomenda terá o mesmo valor que o orçamento)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente após a validação de um contrato
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente um pedido do cliente após a assinatura de uma proposta comercial (o novo pedido terá o mesmo valor da proposta)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar automaticamente uma fatura do cliente depois que uma proposta comercial for assinada (a nova fatura terá o mesmo valor da proposta)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura a cliente após a validação de um contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar automaticamente uma fatura do cliente após o fechamento do pedido do cliente (a nova fatura terá o mesmo valor do pedido)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique o(s) orçamentos(s) associados como faturados quando uma encomenda de um cliente é classificada como faturada (e se a quantidade da encomenda for igual à quantidade total dos orçamentos assinados associados)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifique os orçamentos de clientes vinculados como faturados quando a fatura do cliente é validada (e se o valor da fatura for igual ao montante total dos orçamentos, assinados, vinculados)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique a encomenda do cliente vinculada como enviada quando uma expedição é validada (e se a quantidade enviada por todas as expedições for idêntica à da encomenda a atualizar)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar proposta de origem vinculada como faturada quando o pedido do cliente é definido como faturado (e se o valor do pedido é o mesmo que o valor total da proposta vinculada assinada)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificar a proposta de origem vinculada como faturada quando a fatura do cliente é validada (e se o valor da fatura é o mesmo que o valor total da proposta vinculada assinada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificar o pedido do cliente de origem vinculada como faturado quando a fatura do cliente é validada (e se o valor da fatura é o mesmo que o valor total do pedido vinculado)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificar o pedido do cliente de origem vinculada como faturado quando a fatura do cliente é definida como paga (e se o valor da fatura é o mesmo que o valor total do pedido vinculado)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificar o pedido do cliente de origem vinculada como enviado quando uma remessa é validada (e se a quantidade enviada por todas as remessas é a mesma que na ordem de atualização)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificar a proposta do fornecedor de origem vinculada como faturada quando a fatura do fornecedor é validada (e se o valor da fatura é o mesmo que o valor total da proposta vinculada)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificar o pedido de compra de origem vinculado como faturado quando a fatura do fornecedor é validada (e se o valor da fatura é o mesmo que o valor total do pedido vinculado)
 AutomaticCreation=Criação automática
 AutomaticClassification=Classificação automática
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 586b425787c..6bc41463feb 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funcţonalitate dezactivată în demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Puteți descărca mai multe module de pe site-uri externe de pe Internet ...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Găsiți aplicația / modulele externe
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Instrumente Multi-module
 ModuleFamilyExperimental=Module Experimentale
 ModuleFamilyFinancial=Module financiare (Contabilitate / Trezorerie)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Manager Meniu
 MenuAdmin=Editor Meniu
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Utilizatorii & Grupuri
 Module0Desc=Managementul Utilizatorilor/Angajaților și Grupurilor
 Module1Name=Third Parties
-Module1Desc=Managementul terţilor (societăţi, particulari) şi contactelor
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Comercial
 Module2Desc=Management Comercial
 Module10Name=Contabilitate
@@ -501,7 +501,7 @@ Module23Desc=Monitorizarea consumului de energie
 Module25Name=Comenzi clienţi
 Module25Desc=Managementul Comenzilor Clienţi
 Module30Name=Facturi
-Module30Desc=Facturi şi note de credit "de management pentru clienţi. Facturi de gestionare pentru furnizorii
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Furnizori
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Cote TVA sau Cote Taxe Vanzări
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Conditiile de plata
 DictionaryPaymentModes=Moduri plată
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (DEEE)
 DictionaryPaperFormat=Formate hârtie
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare
 LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul
 LabelOnDocuments=Eticheta de pe documente
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=La sfârşitul lunii
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Audit de securitate evenimente
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Despre Dolibarr
 InfoBrowser=Despre Browser
 InfoOS=Despre SO
@@ -1065,7 +1066,7 @@ BrowserName=Nume Browser
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lista de evenimente Dolibarr de securitate
 SecurityEventsPurged=Evenimentelor de securitate epurate
-LogEventDesc=Puteţi activa jurnalul de evenimente de securitate Dolibarr aici. Administratorii pot vedea apoi conţinutul său prin meniul <b>System Tools - Audit.</b> Atenţie, această caracteristică poate consuma o cantitate mare de date în baza de date.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b> utilizatorii administratori </b>.
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Această zonă este disponibil numai pentru utilizatorii de administrator. Nici una din Dolibarr permisiunile pot reduce această limită.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Pasul de interval de rotunjire (pentru țările în care
 UnitPriceOfProduct=preţul unitar net al unui produs
 TotalPriceAfterRounding=Pret total (net / TVA / inclusiv fiscale) după rotunjirea
 ParameterActiveForNextInputOnly=Parametru de eficient pentru următoarea intrare numai
-NoEventOrNoAuditSetup=Nici un eveniment de securitate a fost înregistrată încă. Acest lucru poate fi normală de audit, dacă nu a fost activată la "setup - securitate - audit" paginii.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Vedeţi-vă locale sendmail setup
 BackupDesc=Pentru a face o copie de siguranţă completă de Dolibarr, trebuie să:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Atribute complementare (linii de comandă)
 ExtraFieldsSupplierInvoicesLines=Atribute complementare (linii de facturare)
 ExtraFieldsThirdParties=Atribute complementare ( terţi)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Atribute complementare (membri)
 ExtraFieldsMemberType=Atribute complementare (tip membri)
 ExtraFieldsCustomerInvoices=Atribute complementare (facturi)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Lista notificărilor fixe
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Mergeți în fila "Notificări" a unei terțe părți pentru a adăuga sau elimina notificări pentru contacte / adrese
 Threshold=Prag
 BackupDumpWizard=Expertul pentru a crea un fișier de bază de date de rezervă pentru baza de date
 SomethingMakeInstallFromWebNotPossible=Instalarea modulului extern nu este posibilă din interfața web din următorul motiv:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 575df64772f..dc504710664 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -7,7 +7,7 @@ BankName=Nume bancă
 FinancialAccount=Cont
 BankAccount=Cont bancar
 BankAccounts=Conturi bancare
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Arată Cont
 AccountRef=Contul financiar ref
 AccountLabel=Contul financiar etichetă
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Adresă Cont
 BankAccountCountry=Tară Cont
 BankAccountOwner=Nume Proprietar Cont
 BankAccountOwnerAddress=Adresă Proprietar Cont
-RIBControlError=Eşec la verificarea integrităţii valorilor . Aceasta înseamnă pentru acest număr de cont nu e complet sau e greşit (verifica ţară, numere şi IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Crează cont
 NewBankAccount=Cont nou
 NewFinancialAccount=Cont financiar nou
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Decontabil
 Conciliate=Deconteaza
 Conciliation=Conciliere
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Includeţi conturile închise
 OnlyOpenedAccount=Numai conturile deschise 
@@ -104,7 +105,7 @@ SocialContributionPayment=Plata taxe sociale sau fiscale și tva
 BankTransfer=Virament bancar
 BankTransfers=Viramente 
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=La transferul dintr-un cont în altul, Dolibarr va scrie două înregistrări (una de debit în contul sursă şi una de credit în contul destinaţie. Pentru această tranzacție va fi folosită aceeași sumă (cu excepția semnului), etichetă și dată)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=De la
 TransferTo=La
 TransferFromToDone=Un viramentr de la  <b>%s</b> la <b> %s </b>  de<b> %s</b> %s a fost creată.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Cecuri bancare
 BankChecksToReceipt=CEC-uri spre încasare
 ShowCheckReceipt=Arată borderou de cecuri remise
-NumberOfCheques=Nr de cecuri
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Inapoi la cont
 ShowAllAccounts=Arată pentru toate conturile
-FutureTransaction=Tranzacţie viitoare. In nici un caz de decontat.
-SelectChequeTransactionAndGenerate=Selectaţi/ filtraţi cecurile pentru a  le include în borderoul de remise şi faceţi clic pe "Crează".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile : YYYYMM sau YYYYMMDD
 EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările
 ToConciliate=Să se acorde?
@@ -153,7 +154,7 @@ RejectCheckDate=data cecului ce a fost returnat
 CheckRejected=Cec returnat
 CheckRejectedAndInvoicesReopened=Cec returnat si facturi redeschise
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 7bfe4417ad0..1dd81b4596b 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Factură Proformă
 InvoiceProFormaDesc=<b>Factura Proformă </b> este o imagine a adevăratei facturi, dar nu are nici o valoare contabilă.
 InvoiceReplacement=Factură  de Înlocuire
 InvoiceReplacementAsk=Factură  de Înlocuire  a altei  facturi
-InvoiceReplacementDesc=<b>;Factură de Înlocuire&lt;/b> este utilizată pentru a anula şi înlocui complet o factură fără nicio plată primită . <br><br> Notă: Doar factura fără nicio plată poate fi înlocuită. Dacă nu s-a inchis, acesta va fi închisă în mod automat cu statutul "abandonat".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Nota de credit
 InvoiceAvoirAsk=Nota de credit pentru a corecta factura
-InvoiceAvoirDesc=<b>Nota de credit</b> este o factură negativă folosită pentru a corecta o factură, fie că are o sumă  care diferă  de suma de plata ( clientul a plătit  prea mult din eroare, sau anumite produse nu vor fi platite complet, de exemplu vor fi returnate).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Creați Nota de credit cu liniile din factura sursă
 invoiceAvoirWithPaymentRestAmount=Creați  Nota de credit cu valoarea neachitată a facturii sursă
 invoiceAvoirLineWithPaymentRestAmount=Notă de credit pentru valoarea rămasă neplătită
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in moneda facturii
 PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plăţi Furnizori
 ReceivedPayments=Încasări primite
 ReceivedCustomersPayments=Încasări  Clienţi
-PayedSuppliersPayments=Plaţi efectuate catre furnizori
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Încasări  Clienţi  de validat
 PaymentsReportsForYear=Rapoarte Plăţi pentru %s
 PaymentsReports=Rapoarte Plăţi
@@ -91,8 +91,8 @@ PaymentConditionsShort=Conditiile de plata
 PaymentAmount=Sumă de plată
 ValidatePayment=Validează plata
 PaymentHigherThanReminderToPay=Plată mai mare decât restul de  plată
-HelpPaymentHigherThanReminderToPay=Atentie, valoarea plăţii la una sau mai multe facturi este mai mare decât  restul de plată. <br> Corectaţi  intrarea, altfel confirmaţi si gîndiţivă  la crearea unei note de credit pentru fiecare plata în exces.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Clasează "Platită"
 ClassifyPaidPartially=Clasează "Platită Parţial"
 ClassifyCanceled=Clasează "Abandonată"
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Închisă (neplătită)
 BillStatusClosedPaidPartially=Platite (parţial)
 BillShortStatusDraft=Schiţă
 BillShortStatusPaid=Platite
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Plătite
 BillShortStatusCanceled=Abandonată
 BillShortStatusValidated=Validată
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Închisă
 BillShortStatusClosedPaidPartially=Platită (parţial)
 PaymentStatusToValidShort=De validat
-ErrorVATIntraNotConfigured=Codul de TVA Intracomunitar nedefinit încă
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Niciun modul de plată implicit definit. Accesaţi configurarea modulului Facturi pentru a remedia acest lucru.
 ErrorCreateBankAccount=Creaţi un cont bancar, apoi accesaţi setările modulului Facturi pentru a defini modul de plată
 ErrorBillNotFound=Factura %s nu există
-ErrorInvoiceAlreadyReplaced=Eroare, încercați să validați o factură pentru a înlocui factura % s. Aceasta a fost deja înlocuită cu factura % s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Eroare, reducerea a fost deja utilizată
 ErrorInvoiceAvoirMustBeNegative=Eroare, factura de corecţie trebuie să aibă o valoare negativă
 ErrorInvoiceOfThisTypeMustBePositive=Eroare, acest tip de factură trebuie să aibă o valoare pozitivă
 ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă schiţă
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=De la
 BillTo=La
 ActionsOnBill=Evenimente pe factura
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statu
 ConfirmCancelBill=Sigur doriţi să anulaţi factura <b> %s</b> ?
 ConfirmCancelBillQuestion=De ce doriți clasificarea acestei facturi ca "abandonată"?
 ConfirmClassifyPaidPartially=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul plătită ?
-ConfirmClassifyPaidPartiallyQuestion=Această factură nu a fost achitată complet. De ce doriți închiderea acestei facturi?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Regularizarea TVA-ului, cu o nota de credit.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piarderea TVA-ului pentru această reducere.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Recuperez TVA-ul de pe această reducere fără o notă de credit.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client rău platnic
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produse parţial returnate
 ConfirmClassifyPaidPartiallyReasonOther=Creanţă  abandonată din alte motive
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Această alegere este posibilă în cazul în care factura a fost prevăzută cu un comentariu adecvat. (Exemplu "Numai impozitul corespunzător prețului care a fost plătit de fapt, dă dreptul de deducere»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=În unele țări, această alegere ar putea fi posibilă numai în cazul în care factura dvs. conține nota corectă.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Utilizaţi această opţiune dacă toate celelalte nu se potrivesc
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>client de rau platnic</b> este un client care refuză să plătească datoria lui.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Această opţiune este utilizată atunci când plata nu este completă, deoarece unele  produse au fost returnate
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizaţi această opţiune dacă toate celelalte nu se potrivesc, de exemplu, în următoarele situaţii: <br> - Plată parţială deoarece unele produse au fost returnate <br> - Suma revendicată prea mare pentru că o reducere a fost uitată <br> În toate cazurile, suma reclamată  trebuie să fie corectată în contabilitate, prin crearea unei note de credit.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Altele
 ConfirmClassifyAbandonReasonOtherDesc=Această opţiune va fi folosită în toate celelalte cazuri. De exemplu,  dacă ai dori să creezi o factura de inlocuire a facturii.
 ConfirmCustomerPayment=Confirmaţi introducerea plăţii pentru <b>%s</b> %s ?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Confirmaţi introducerea plăţii pentru <b>%s</b> %s ?
 ConfirmValidatePayment=Sunteți sigur că doriți validarea acestei plăti? Nici o schimbare nu mai este posibilă după validarea plății.
 ValidateBill=Validează factura
 UnvalidateBill=Devalidează factura
-NumberOfBills=Nr  facturi
-NumberOfBillsByMonth=Nr facturi pe luni
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Valoare facturi
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva)
 ShowSocialContribution=Afisează taxa sociala/fiscala
 ShowBill=Afisează  factura
@@ -260,9 +262,9 @@ Repeatables=Modele
 ChangeIntoRepeatableInvoice=Converteşte in model factură
 CreateRepeatableInvoice=Crează model factură
 CreateFromRepeatableInvoice=Crează din model factură 
-CustomersInvoicesAndInvoiceLines=Facturi Clienţi şi linii facturi
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Facturi Clienţi  şi plăţi
-ExportDataset_invoice_1=Lista Facturi Clienţi şi linii facturi
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Facturi Clienţi  şi plăţi
 ProformaBill=Factură Proforma :
 Reduction=Reducere
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Adresa de facturare
-HelpEscompte=Această reducere este un discount acordat clientului pentru că plata  a fost făcută înainte de termen.
-HelpAbandonBadCustomer=Această sumă a fost abandonată (client declarat  rău platnic) şi este considerată ca fiind o pierdere excepţională.
-HelpAbandonOther=Această sumă a fost abandonată, deoarece a fost o eroare (client greșit sau factura înlocuită cu alta, de exemplu)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Id Plata taxa sociala / fiscala 
 PaymentId=ID Plată
 PaymentRef=Ref. plată
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nicio factură selectată
 CloneInvoice=Clonează factura
 ConfirmCloneInvoice=Sigur doriţi să clonaţi această factură <b> %s</b>?
 DisabledBecauseReplacedInvoice=Acţiunea dezactivată, pentru că factura a fost înlocuită
-DescTaxAndDividendsArea=Această zonă prezintă un rezumat al tuturor plăților efectuate pentru cheltuieli speciale. Doar înregistrările cu plăți în cursul anului fix sunt incluse aici.
-NbOfPayments=Nr plăţi
+DescTaxAndDividendsArea=Această zonă  prezintă un rezumat al tuturor plăţilor efectuate pentru cheltuieli speciale. Numai  înregistrările cu plaţi în cursul anului sunt incluse aici.
+NbOfPayments=No. of payments
 SplitDiscount=Imparte reducerea în două
-ConfirmSplitDiscount=Sigur doriți împărțirea acestei reduceri de <b>%s</b> %s în 2 reduceri mai mici?
-TypeAmountOfEachNewDiscount=Introduceţi Valoarea, pentru fiecare din cele două părţi:
-TotalOfTwoDiscountMustEqualsOriginal=Valoarea totală a celor două noi reduceri trebuie să fie egală cu valoarea discountului original.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Sigur doriţi să eliminaţi această reducere?
 RelatedBill=Factură asociată
 RelatedBills=Facturi asociate
 RelatedCustomerInvoices=Facturi client asociate
 RelatedSupplierInvoices=Facturi asociate Furnizor
 LatestRelatedBill=Ultima Factură asociată
-WarningBillExist=Avertisment, una sau mai multe facturi există deja
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Instrument unire (merge) PDF
 AmountPaymentDistributedOnInvoice=Sumă plătită distribuită pe factură
-PaymentOnDifferentThirdBills=Permite plata la parteneri diferiţi cu aceeaşi companie părinte
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Comentariu plată
 ListOfPreviousSituationInvoices=Lista facturilor de situaţie anterioare
 ListOfNextSituationInvoices=Lista facturilor de situaţie următoare
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Cec
 PaymentTypeShortCHQ=Cec
 PaymentTypeTIP=D/ P (Documente contra plata)
 PaymentTypeShortTIP=D/ P Plata
-PaymentTypeVAD=Online
-PaymentTypeShortVAD=Online
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Schita banca
 PaymentTypeShortTRA=Schita
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Coordonate Bancă
 BankCode=Cod Bancă
-DeskCode=Cod Ghiseu
+DeskCode=Office code
 BankAccountNumber=Număr cont
-BankAccountNumberKey=RIB
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=Cod IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=Cod BIC / SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Plata prin virament pe următorul cont bancar
 VATIsNotUsedForInvoice=* TVA neaplicabil art-293B din CGI
 LawApplicationPart1=Prin aplicarea legii 80.335 din 12.05.80
 LawApplicationPart2=mărfurile rămân în proprietatea
-LawApplicationPart3=vânzătorului, până la  incasarea completă a
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=preţului lor.
 LimitedLiabilityCompanyCapital=SRL cu capitalul de
 UseLine=Aplică
@@ -463,7 +465,7 @@ Cheques=Cecuri
 DepositId=Depozit id
 NbCheque=Număr cecuri
 CreditNoteConvertedIntoDiscount=Acest %s a fost transformat în %s
-UsBillingContactAsIncoiveRecipientIfExist=Utilizaţi , adresa  de facturare a contactului  clientului în loc de o adresa terţului  ca adresa a destinatarului pentru facturi
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Afişează toate facturile neachitate
 ShowUnpaidLateOnly=Afişează numai facturile întârziate la plată
 PaymentInvoiceRef=Plată factură %s
@@ -474,21 +476,22 @@ Reported=Întârziat
 DisabledBecausePayments=Nu este posibil, deoarece există unele plăţi
 CantRemovePaymentWithOneInvoicePaid=Nu se poate elimina plata deoarece există cel puțin o factură clasificată plătită
 ExpectedToPay=Plată prevăzută
-CantRemoveConciliatedPayment=Nu se poate şterge o plată reconciliată
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Achitat cu aceasta plată
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Clasează "Platite" toate notele de credit rambursate în întregime
-ClosePaidContributionsAutomatically=Închide toate contribuţiile sociale sau fiscale plătite integral
-AllCompletelyPayedInvoiceWillBeClosed=Toate facturile cu rest de plată zero vor fi închise automat cu statusul "Plătită".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Plăteşte
 ToMakePaymentBack=Rambursează
 ListOfYourUnpaidInvoices=Lista facturilor neplătite
 NoteListOfYourUnpaidInvoices=Notă: Această listă conține numai facturile pentru partenerii la care sunteţi reprezentant de vânzării.
 RevenueStamp=Timbru fiscal
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
 PDFCrabeDescription=Şablon PDF Factura Crabe . Un șablon factură complet (format recomandat)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Model factură PDF Crevette. Un model complet pentru factura de situaţie
 TerreNumRefModelDesc1=Returnează numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Progresul liniei din factură nu poate fi egal sau mai
 updatePriceNextInvoiceErrorUpdateline=Eroare : actualizare preţ pe linia: %s
 ToCreateARecurringInvoice=Pentru a crea o factură recurentă la acest contract, se creeaza intai o factura schita, apoi se transforma cu un model de factura si se defineste frecventa generarii facturilor urmatoare.
 ToCreateARecurringInvoiceGene=Meniu pentru a crea facturi recurente manual <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Daca este necesara generarea automata a facturilor, se solicita administratorului de sistem activarea modulului <strong>%s</strong>. Ambele metode (manuala si automata) pot fi utilizate simultan fara riscul duplicarii.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Factură ştearsă
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index 261d107c4ea..affc2a1471c 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Afişare companie
 ShowStock=Arată depozit
 DeleteArticle=Faceţi clic pentru a elimina acest articol
 FilterRefOrLabelOrBC=Caută (Ref/Etichetă)
-UserNeedPermissionToEditStockToUsePos=Ca să scadă stocul la crearea facturii utilizatorul care foloseşte POSul trebuie sa aibă permisiunea de a edita stocul.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Printer încasare
+PointOfSale=Punct de vânzări
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 64f5a388c24..dd615058dd1 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Apel Telefonic
 ActionAC_FAX=Trimitere fax
 ActionAC_PROP=Trimitere  ofertă pe e-mail
 ActionAC_EMAIL=Trimitere e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Întâlniri
 ActionAC_INT=Intervenţie în site
 ActionAC_FAC=Trimitere factura client pe e-mail
@@ -72,8 +73,8 @@ StatusProsp=Statut Prospect
 DraftPropals=Oferte Comerciale Schiţă
 NoLimit=Nelimitat 
 ToOfferALinkForOnlineSignature=Link pentru semnatura online
-WelcomeOnOnlineSignaturePage=Bine ati venit pe pagina de acceptare a propunerii comerciale de la %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=Acest ecran vă permite  sa acceptati sisemnati , sau refuzati o oferta /propunere comerciala
 ThisIsInformationOnDocumentToSign=Aceasta este informatia pe document de accetat sau refuzat
-SignatureProposalRef=Semnare a propunerii/ofertei comerciale %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Functionalitate pentru semnare online dezactivata sau documentul generat inainte de functionalitae a fost activat
diff --git a/htdocs/langs/ro_RO/dict.lang b/htdocs/langs/ro_RO/dict.lang
index b6c2bc4edd6..d377fdbf25a 100644
--- a/htdocs/langs/ro_RO/dict.lang
+++ b/htdocs/langs/ro_RO/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Insula Heard şi McDonald
 CountryVA=Sfântul Scaun (Cetatea Vaticanului membru)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonezia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Coreea de Nord
 CountryKR=Coreea de Sud
 CountryKW=Kuweit
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Laoţiană
 CountryLV=Letonia
 CountryLB=Liban
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Montserrat
 CountryMZ=Mozambic
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad şi Tobago
 CountryTR=Turcia
 CountryTM=Turkmenistan
-CountryTC=Insulele Turks şi Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ucraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupii
 CurrencySingMUR=Rupie Mauritius
 CurrencyNOK=Krones norvegiană
-CurrencySingNOK=Coroană norvegiană
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=TND
 CurrencySingTND=Dinar tunisian
 CurrencyUSD=Dolar SUA
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=din gură în gură
 DemandReasonTypeSRC_PARTNER=Partener
 DemandReasonTypeSRC_EMPLOYEE=Angajat
 DemandReasonTypeSRC_SPONSORING=Sponsor
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index 4e1193b4c50..ffe6fc9e092 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nr documente în director
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Director
 ECMSectionManual=Director Manual
 ECMSectionAuto=Director Automat
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documente legate de proiecte
 ECMDocsByUsers=Documente legate de utilizatori
 ECMDocsByInterventions=Documente legate de interventii
 ECMDocsByExpenseReports=Documente legate de rapoartele de cheltuieli
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Niciun directorul creat
 ShowECMSection=Arată director
 DeleteSection=Elimină director
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index ff9165fb26e..441e3a26315 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=Client SOAP esuat cu eroarea '%s'
 ErrorGlobalVariableUpdater5=Nicio varialbila globala selectata
 ErrorFieldMustBeANumeric=Campul <b>%s</b> trebuie sa fie  o valoare numerica
 ErrorMandatoryParametersNotProvided= Parametrii obligatorii nu au fost furnizați 
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definire greșită pentru Menu Array in descriptorul modulului (valoare greșită pentru cheia fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
 WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/help.lang b/htdocs/langs/ro_RO/help.lang
index 5e9a579d4a9..57ace0c4cc4 100644
--- a/htdocs/langs/ro_RO/help.lang
+++ b/htdocs/langs/ro_RO/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Suport în timp real / remote
 OtherSupport=Alte tipuri de suport
 ToSeeListOfAvailableRessources=Pentru a contacta / vezi resurse disponibile:
 HelpCenter=Centrul de Ajutor
-DolibarrHelpCenter=Dolibarr Centrul de Ajutor şi Asistenţă
-ToGoBackToDolibarr=Altfel, faceţi clic <a href="%s">aici pentru a utiliza Dolibarr</a>
-TypeOfSupport=Sursa suport
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Comunitate (gratuit)
 TypeSupportCommercial=Comercial
 TypeOfHelp=Tip
@@ -15,12 +15,9 @@ NeedHelpCenter=Aveți nevoie de ajutor sau sprijin?
 Efficiency=Eficienţa
 TypeHelpOnly=Numai Ajutor
 TypeHelpDev=Ajutor + Dezvoltare
-TypeHelpDevForm=Ajutor  + Dezvoltare + Formare
-ToGetHelpGoOnSparkAngels1=Unele companii pot oferi rapid (chiar imediat uneori) şi  mai eficient asistenţă online, prin preluarea controlului de pe computer. Aceste ajutoare pot fi găsite pe site-ul : <b> %s</b>
-ToGetHelpGoOnSparkAngels3=Puteți merge, de asemenea, la lista tuturor antrenorilor disponibili pentru Dolibarr, pentru aceasta click pe butonul
-ToGetHelpGoOnSparkAngels2=Uneori, nu există nicio companie disponibilă în momentul în care faceţi dvs. căutarea, astfel schimbţi filtrul pentru a căuta  pe "toți disponibili". Veți putea trimite mai multe cereri.
-BackToHelpCenter=Altfel, clic aici pentru a merge <a href="%s">înapoi la pentru pagina de start a Centrul de Ajutor</a>.
-LinkToGoldMember=Puteți apela unul dintre antrenori preselectati de Dolibarr pentru limba (%s) făcând clic pe balonul Widget (statusul și prețul maxim sunt actualizate automat):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Limbi suportate
-SubscribeToFoundation=Ajută proiectul Dolibarr, subscrie la fundație
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Pentru suport oficial Dolibarr în limba dvs:  <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index ce65ca53ebe..90589aa0a5e 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Concedii
-CPTitreMenu=Concedii
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Situaţia lunară
 MenuAddCP=Cerere de concediu noua
-NotActiveModCP=Trebuie să activaţi modulul de concedii pentru a vedea această pagină.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Crează o cerere de concediu
 DateDebCP=Dată început
 DateFinCP=Dată sfărşit
@@ -15,13 +15,18 @@ ApprovedCP=Aprobat
 CancelCP=Şters
 RefuseCP=Refuzat
 ValidatorCP=Aprobator
-ListeCP=Listă cereri de concedii
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Descriere
 SendRequestCP=Crează o cerere de concediu
 DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin <b>%s zi(le)</b> înainte.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Soldul concediilor este de <b>%s</b> zile.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început.
 ErrorSQLCreateCP=O eroare SQL întâlnită în timpul creării:
 ErrorIDFicheCP=O eroare a intervenit, cererea de concediu nu exista
@@ -30,7 +35,14 @@ ErrorUserViewCP=Dvs nu aveti dreptul de a citi aceata cerere de concediu.
 InfosWorkflowCP=Flux de lucru Informatii
 RequestByCP=Solicitat de
 TitreRequestCP=Cereri de concedii
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Numărul de zile de concediu consumate
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Editare
 DeleteCP=Ştergere
 ActionRefuseCP=Refuzare
@@ -59,6 +71,7 @@ DateRefusCP=Data refuzului
 DateCancelCP=Data anulării
 DefineEventUserCP=Atribuie un concediu excepţional pentru un utilizator
 addEventToUserCP=Atribuie concediu
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Motiv
 UserCP=Utilizator
 ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Actualizare realizată.
 Module27130Name= Managementul cererilor de concedii
 Module27130Desc= Managementul cererilor de concedii
@@ -94,7 +112,7 @@ NoticePeriod=Perioadă notita
 HolidaysToValidate=Validează cereri concedii
 HolidaysToValidateBody=Mai jos este o cerere de concediu de validat
 HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o  perioadă de mai puţin de %s zile.
-HolidaysToValidateAlertSolde=Utilizatorul care a făcut această cerere de concediu nu avea destule zile disponibile.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Cereri de concedii validate
 HolidaysValidatedBody=Cererea dvs pentru concediu  pentru %s la %s a fost validată.
 HolidaysRefused=Cerere respinsă
@@ -103,4 +121,9 @@ HolidaysCanceled=Cereri Concedii anulate
 HolidaysCanceledBody=Cererea dvs pentru concediu  pentru %s la %s a fost anulată.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Du-te  la <strong>Home -Setup - Dictionare -Tip Concedii </strong> pentru a configura diferite tipuri de concediu.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index b4b9554dde2..c09b2eb16fb 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Doar urmaţi instrucţiunile pas cu pas.
 MiscellaneousChecks=Verificare Cerinţe preliminare 
 ConfFileExists=<b>%s</b> fişierul de configurare există.
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> de fişiere de configurare nu există şi nu a putut fi creat!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Fişier de configurare <b>%s</b> ar putea fi creat.
-ConfFileIsNotWritable=<b>%s</b> fişier de configurare nu poate fi scris. Verificaţi permisiunile. Pentru prima de instalare, serverul de web trebuie să fie acordate pentru a putea scrie în acest fişier în timpul procesului de configurare (&quot;chmod 666&quot;, de exemplu, pe un Unix ca OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=<b>%s</b> fişier de configurare este de scriere.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reîncarcă toate informaţiile din fişierul de configurare.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
-PHPSupportPOSTGETKo=Este posibil de configurare PHP nu suporta variabile POST şi / sau GET. Verificaţi <b>variables_order</b> de parametru în php.ini.
-PHPSupportGD=Acest PHP suportă  functii grafice GD.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Acest PHP suportă  funcţii  UTF8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
-PHPMemoryTooLow=PHP max memorie sesiune este setată la octeţi <b>%s.</b> Acest lucru ar trebui să fie prea mic. Modificarea <b>php.ini</b> pentru a seta parametrul <b>memory_limit</b> de bytes <b>%s</b> cel puţin.
-Recheck=Click aici pentru un test mult mai semnificativ
-ErrorPHPDoesNotSupportSessions=Instalarea dvs. PHP nu are suport pentru sesiuni. Această caracteristică este necesar pentru a face Dolibarr de lucru. Verificaţi configurarea PHP.
-ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu are suport pentru funcţia de grafică HG nr. Graficul nu va fi disponibil.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Instalarea dvs. PHP nu are suport pentru funcţii utf8. Dolibarr nu poate funcţiona corect. Rezolva acest lucru înainte de a instala Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directorul  %s  nu există.
-ErrorGoBackAndCorrectParameters=Du-te înapoi şi de a corecta parametrii greşite.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul &quot;%s&quot;.
 ErrorFailedToCreateDatabase=Eşec la crearea bazei de date '%s'.
 ErrorFailedToConnectToDatabase=Eşec la conectarea la baza de date '%s'.
 ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) prea veche. Versiunea %s este necesară.
 ErrorPHPVersionTooLow=PHP versiune prea veche. %s versiune este necesar.
-ErrorConnectedButDatabaseNotFound=Conectarea la serverul de succes, dar &quot;%s&quot; bază de date nu a fost găsit.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Baza de date  '%s' există deja.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Dacă baza de date nu există, du-te înapoi şi a verifica opţiunea &quot;Creare bază de date&quot;.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifaţi &quot;Crearea bazei de date&quot; opţiune.
-WarningBrowserTooOld=Versiune prea veche a browser-ului. Actualizarea browser-ul dvs. la o versiune recentă a Firefox, Chrome sau Opera este foarte recomandată.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Versiunea PHP
 License=Utilizarea de licenţă
 ConfigurationFile=Fişier de configurare
@@ -45,22 +45,23 @@ DolibarrDatabase=Baza de date Dolibarr
 DatabaseType=Tip Baza de date 
 DriverType=Tip driver
 Server=Server
-ServerAddressDescription=Numele sau adresa IP pentru serverul de baze de date, de obicei &quot;localhost&quot;, atunci când serverul de baze de date este găzduit pe acelaşi server decât serverul de web
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Port-ul serverului de baze de date. Păstraţi gol, dacă necunoscut.
 DatabaseServer=Server  baze de date
 DatabaseName=Nume bază de date
-DatabasePrefix=Prefix Tabel Baza de date
-AdminLogin=Autentifica-te pentru proprietarul bazei de date Dolibarr.
-PasswordAgain=Rescrie parola pentru a doua oară
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Parola pentru proprietarul bazei de date Dolibarr.
 CreateDatabase=Crearea bazei de date
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Serverul de baze de date - superuser de acces
-CheckToCreateDatabase=Verificaţi dacă în cutia în cazul în care baza de date nu există şi trebuie să fie creat. <br> În acest caz, trebuie să completaţi datele de conectare / parola pentru contul de superuser, la partea de jos a acestei pagini.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login utilizatorului posibilitatea de a crea baze de date noi sau de noi utilizatori, inutil în cazul în care baza de date si login-ul bazei de date există deja (ca atunci cand sunt găzduite de către un furnizor de web hosting).
-KeepEmptyIfNoPassword=Lasă un gol în cazul în care utilizatorul nu are nici o parola (a evita acest lucru)
-SaveConfigurationFile=Salvaţi valorile
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Conexiune server
 DatabaseCreation=Baza de date crearea de
 CreateDatabaseObjects=Baza de date crearea de obiecte
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Crearea cheile străine şi indicii pentru %s de masă
 OtherKeysCreation=Cheile străine şi crearea de indici
 FunctionsCreation=Creare Funcţii
 AdminAccountCreation=Administrator crearea de autentificare
-PleaseTypePassword=Vă rugăm să introduceţi o parolă, parole goale nu sunt permise!
-PleaseTypeALogin=Vă rugăm să introduceţi un login!
-PasswordsMismatch=Parolele diferă, vă rugăm să încercaţi din nou!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Sfârşitul de configurare
 SystemIsInstalled=Această instalare este completă.
 SystemIsUpgraded=Dolibarr a fost actualizat cu succes.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Trebuie să vă configuraţi Dolibarr pentru a se potr
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Du-te la Dolibarr
 GoToSetupArea=Du-te la Dolibarr (zona de configurare)
-MigrationNotFinished=Versiunea de baza de date nu este complet până la data de, aşa că va trebui să rulaţi procesul de actualizare din nou.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Du-te la pagina din nou upgrade
 WithNoSlashAtTheEnd=Fără a slash &quot;/&quot; de la sfârşitul
-DirectoryRecommendation=Este recommanded de a utiliza un director afara de directorul de paginile dvs. de web.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Există deja
 DolibarrAdminLogin=Dolibarr admin autentificare
-AdminLoginAlreadyExists=<b>&quot;%s&quot;</b> Dolibarr cont de administrator deja există. Du-te înapoi, dacă doriţi să creaţi altul.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Atenţie, pentru motive de securitate, o dată sau de upgrade-ul de instalare este completă, trebuie să scoateţi <b>directorul de instalare sau de a adăuga un fişier numit director install.lock în documentul Dolibarr, în scopul de a evita utilizarea rău intenţionată a acestuia.</b>
-FunctionNotAvailableInThisPHP=Nu este disponibil pe acest PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Alegeţi script-ul de migraţie
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script de prelucrare
 ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe &quot;Start&quot; ...
 FreshInstall=Instalare proaspătă
-FreshInstallDesc=Utilizaţi acest mod în cazul în care aceasta este prima de instalare. Dacă nu, acest mod se poate repara o instalare incompleta anterior, dar dacă doriţi să faceţi upgrade versiunii dvs., alegeţi &quot;Upgrade&quot; modul.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Uaktualnij
 UpgradeDesc=Utilizaţi acest mod, dacă aţi înlocuit fişierele vechi Dolibarr cu fişiere dintr-o versiune mai nouă. Acest lucru se va actualiza baza de date şi de date.
 Start=Începe
 InstallNotAllowed=Setup nu este permis de permisiuni <b>conf.php</b>
 YouMustCreateWithPermission=Trebuie să creaţi %s de fişiere şi setaţi permisiuni de scriere pe el pentru serverul de web în timpul procesului de instalare.
-CorrectProblemAndReloadPage=Va rugam sa rezolva problema şi apăsaţi F5 pentru a reîncărca pagina.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Migrat deja
 DatabaseVersion=Versiunea bazei de date
 ServerVersion=Baza de date server de versiune
 YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi pentru a permite serverului de web pentru a scrie în ea.
 DBSortingCollation=Caracter de sortare pentru
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Să vă întreb pentru a crea <b>%s</b> de baze de date, dar pentru acest lucru, Dolibarr trebuie să se conecteze la server <b>%s</b> cu permisiuni super <b>%s</b> de utilizator.
-YouAskLoginCreationSoDolibarrNeedToConnect=Să vă întreb pentru a crea baza de date de logare <b>%s,</b> dar pentru acest lucru, Dolibarr trebuie să se conecteze la server <b>%s</b> cu permisiuni super <b>%s</b> de utilizator.
-BecauseConnectionFailedParametersMayBeWrong=Aşa cum nu a reuşit conectarea, gazdă sau parametrii de super utilizator trebuie să fie greşit.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Plata orfani detectat de %s metoda
 RemoveItManuallyAndPressF5ToContinue=Scoateţi-l manual şi apăsaţi F5 pentru a continua.
 FieldRenamed=Câmp redenumit
-IfLoginDoesNotExistsCheckCreateUser=Dacă datele de autentificare nu există încă, trebuie să verificaţi opţiunea &quot;Creare utilizator&quot;
-ErrorConnection=Server <b>&quot;%s&quot;,</b> numele bazei de date <b>&quot;%s&quot;,</b> numele de <b>&quot;%s&quot;,</b> sau parola bazei de date poate fi greşit sau versiunea client PHP poate fi prea vechi, comparativ cu versiunea bazei de date.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Alegerea recomandate pentru a instala versiunea din <b>%s %s</b> versiunea sistemului de operare actuale
 InstallChoiceSuggested=<b>Instalaţi alegere sugerat de instalator.</b>
-MigrateIsDoneStepByStep=Versiunea ţintă (%s) are un deficit de mai multe versiuni, astfel încât instalaţi expertul va reveni pentru a sugera migraţiei viitor, după ce acesta va fi terminat.
-CheckThatDatabasenameIsCorrect=Verificaţi că numele bazei de date <b>&quot;%s&quot;</b> este corectă.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=În cazul în care acest nume este corectă şi că baza de date nu există încă, trebuie să verificaţi opţiunea &quot;Creare bază de date&quot;.
 OpenBaseDir= Parametru openbasedir PHP 
-YouAskToCreateDatabaseSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
-YouAskToCreateDatabaseUserSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date proprietar&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
-NextStepMightLastALongTime=Pasul curent poate dura câteva minute. Vă rugăm să aşteptaţi până când este afişat următorul ecran complet înainte de a continua.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrarea de transport maritim pentru depozitare client comenzi
 MigrationShippingDelivery=Upgrade de depozitare de transport maritim
 MigrationShippingDelivery2=Upgrade de depozitare de transport 2
 MigrationFinished=Migraţia terminată
-LastStepDesc=<strong>Ultimul pas:</strong> Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activaţi modul %s
 ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansaţi (mod expert)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Versiunea dvs. de baze de date este %s. Un bug va poate face sa pierdeti  date critice dacă faceti o schimbare a structurii pe baza de date,asa cum este impusă de procesul de migrare. De  aceea, migrare nu va fi permisa până când faceți upgrade la  baza de date la o versiune mai mare  (lista bug-urilor  cunoscute versiunea : %s)
-KeepDefaultValuesWamp=Puteţi utiliza expertul de configurare de la Dolibarr DoliWamp, astfel încât valorile propuse aici sunt deja optimizate. Schimbaţi-le numai daca stii ce faci.
-KeepDefaultValuesDeb=Puteţi utiliza expertul de configurare Dolibarr dintr-un pachet Linux (Ubuntu, Debian, Fedora ...), astfel încât valorile propuse aici sunt deja optimizate. Numai parola proprietarul bazei de date pentru a crea trebuie să fie completate. Modificarea alţi parametri numai dacă ştii ce faci.
-KeepDefaultValuesMamp=Puteţi utiliza expertul de configurare de la Dolibarr DoliMamp, astfel încât valorile propuse aici sunt deja optimizate. Schimbaţi-le numai daca stii ce faci.
-KeepDefaultValuesProxmox=Puteţi utiliza expertul de configurare Dolibarr de la un aparat Proxmox virtuale, astfel încât valorile propuse aici sunt deja optimizate. Schimbaţi-le numai daca stii ce faci.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrare de date pentru oferte comerciale
 MigrationInvoice=Migrare de date pentru facturile clienţilor
 MigrationContract=Migrarea datelor pentru contracte
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade de succes
 MigrationUpdateFailed=Procesul de actualizare a eşuat
 MigrationRelationshipTables=Migrare a datelor pentru tabelele relaţie (%s)
 MigrationPaymentsUpdate=Corecţie dată de plată 
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract de date de corecţie
 MigrationContractsNumberToUpdate=Contract de %s (e) pentru a actualiza
 MigrationContractsLineCreation=Creeze o linie contract pentru %s ref contract
 MigrationContractsNothingToUpdate=Nu există mai multe lucruri de făcut
-MigrationContractsFieldDontExist=Fk_facture domeniu nu exista mai. Nimic de a face.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Corecţie contract de gol data
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Nici data contractului gol pentru a corecta
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nici o creaţie data contractului pentru a corecta
 MigrationContractsInvalidDatesUpdate=Bad data valoarea contractului de corecţie
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Actualizare Livrare
 MigrationStockDetail=Actualizarea valoarea stocului de produse
 MigrationMenusDetail=Actualizaţi tabelele de meniuri dinamice
 MigrationDeliveryAddress=Actualizaţi adresa de livrare în transporturi
-MigrationProjectTaskActors=Migrare de date pentru tabel llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migrarea datelor domeniul fk_user_resp de llx_projet la llx_element_contact
 MigrationProjectTaskTime=Actualizare de timp petrecut în secunde
 MigrationActioncommElement=Actualizare date pe acţiuni
 MigrationPaymentMode=Migrare de date pentru modul de plată
 MigrationCategorieAssociation=Migrarea categoriilor
-MigrationEvents=Migrația evenimentelor pentru a adăuga proprietarului evenimentul în tabelul de atribuire
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reîncarcă modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Afişează opţiunile nedisponibile
-HideNotAvailableOptions=Acunde opţiunile nedisponibile
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 99e1fa9fd0b..c0fadffaded 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacte pentru aceast terţ
 ContactsAddressesForCompany=Contacte pentru aceast terţ
 AddressesForCompany=Adrese pentru acest terţ
 ActionsOnCompany=Evenimente  privind  acest terţ
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Evenimente  privind  acest membru
 ActionsOnProduct=Events about this product
 NActionsLate=%s  întârziat
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Raport Cheltuieli
 ExpenseReports=Rapoarte Cheltuieli
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 6f6f2127856..d423e560227 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Legate de obiectul
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Configurare modul website
 WEBSITE_PAGEURL=URL pagina
 WEBSITE_TITLE=Titlu
 WEBSITE_DESCRIPTION=Descriere
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Cuvânt cheie
 LinesToImport=Lines to import
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index b0e99c72a36..bd0901dfef1 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox modul de configurare
 PayBoxDesc=Acest modul oferă pagini pentru a permite plata pe <a href="http://www.paybox.com" target="_blank">Paybox</a> de către clienţi. Acest lucru poate fi folosit pentru un cont gratuit sau plată pentru o plată de pe un anumit obiect Dolibarr (factură, pentru, ...)
 FollowingUrlAreAvailableToMakePayments=Ca urmare a URL-uri sunt disponibile pentru a oferi o pagină de la un client pentru a face o plată pe Dolibarr obiecte
 PaymentForm=Formă de plată
-WelcomeOnPaymentPage=Bine ati venit la serviciul de plată online
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Acest ecran vă permite de a face o plată online pentru %s.
 ThisIsInformationOnPayment=Acest lucru este de informatii cu privire la plata de a face
 ToComplete=Pentru a completa
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL-ul pentru a oferi un %s plata online i
 ToOfferALinkForOnlinePaymentOnContractLine=URL-ul pentru a oferi un %s plata online interfaţă cu utilizatorul pentru un contract de linie
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL-ul pentru a oferi un %s plata online interfaţă de utilizator pentru o suma de liber
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL-ul pentru a oferi o plată %s interfata online pentru un abonament de membru
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Puteţi, de asemenea, să adăugaţi URL-ul parametru <b>& tag= <i>valoarea</i></b> la oricare dintre aceste URL-ul (necesar doar pentru liber de plată) pentru a adăuga propriul plată comentariu tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Configuraţi-vă PayBox cu <b>URL-ul %s</b> pentru a avea de plată a creat în mod automat atunci când validate de paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Această pagină confirmă faptul că plata dvs. a fost înregistrată. Mulţumesc.
-YourPaymentHasNotBeenRecorded=Sunteţi de plată nu a fost înregistrată şi pe tranzacţie a fost anulată. Mulţumesc.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametri Cont
 UsageParameter=Utilizarea parametrilor
 InformationToFindParameters=Ajutor pentru a găsi informaţiile dvs. de cont %s
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index e2769afb273..efb928e171e 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Semnată (de facturat)
 PropalStatusNotSigned=Nesemnată (inchisă)
 PropalStatusBilled=Facturată
 PropalStatusDraftShort=Schiţă
-PropalStatusValidatedShort=Validată
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Închisă
 PropalStatusSignedShort=Semnată
 PropalStatusNotSignedShort=Nesemnată
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propunearea %s nu a fost găsită
 AddToDraftProposals=Adaugă  ofertă schiţă
 NoDraftProposals=Nicio ofertă schiţă
 CopyPropalFrom=Crează ofertă comercială prin copierea uneia existente
-CreateEmptyPropal=Crează ofertă comercială/deviz nouă sau din lista de produse / servicii
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Durata validării implicite  a ofertei (în zile)
-UseCustomerContactAsPropalRecipientIfExist=Utilizați adresa de contact a clientului  în cazul în care este definită în loc de adresa terţului ca destinatarul ofertei
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clonează oferta comercială
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Contact client urmărire ofertă
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Model de ofertă comercială  completă (logo. ..)
+DocModelCyanDescription=Model de ofertă comercială  completă (logo. ..)
 DefaultModelPropalCreate=Crează model implicit
 DefaultModelPropalToBill=Model implicit la închiderea unei oferte comerciale (de facturat)
 DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (nefacturat)
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 79425dc7e14..6505bf40f76 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Cod
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Şterge website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Pagina nume/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit meniu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Seteaza ca  pagina Home 
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Citit
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 2a3b9967574..429eb1a8e0f 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Функция отключена в демо -
 FeatureAvailableOnlyOnStable=Функция доступна только в официальных стабильных версиях
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Показаны только элементы из <a href="%s">включенных модулей</a>
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=В интернете вы можете найти больше модулей для загрузки...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Поиск внешних приложений/модулей
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Много-модульные инструменты
 ModuleFamilyExperimental=Экспериментальные модули
 ModuleFamilyFinancial=Финансовые модули (Бухгалтерия / Казначейство)
 ModuleFamilyECM=Управление электронным содержимым (ECM)
-ModuleFamilyPortal=Веб-сайты и другие фронтальные приложения
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Интерфейсы с внешними системами
 MenuHandlers=Обработчики меню
 MenuAdmin=Редактор меню
@@ -463,9 +463,9 @@ ClickToShowDescription=Нажмите, чтобы посмотреть опис
 DependsOn=This module needs the module(s)
 RequiredBy=Этому модулю требуется модуль (модулями)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br> Для формы, чтобы создать новую третью сторону, она <strong> %s </strong>, <br> Если вы хотите значение по умолчанию, только если url имеет некоторый параметр, вы можете использовать <strong> %s </strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Включить использование персонализированных значений по умолчанию
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Пользователи и Группы
 Module0Desc=Управление Пользователями / Сотрудниками и Группами
 Module1Name=Third Parties
-Module1Desc=Компании и управление контактами (клиенты, перспективы...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Коммерческие
 Module2Desc=Коммерческое управление
 Module10Name=Бухгалтерия
@@ -501,7 +501,7 @@ Module23Desc=Мониторинг потребления энергии
 Module25Name=Заказы клиентов
 Module25Desc=Управление заказами клиентов
 Module30Name=Счета-фактуры
-Module30Desc=Управелние счет-фактурами и кредитными заметками клиентов. Управелние счет-фактурами поставщиков
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Поставщики
 Module40Desc=Поставщики и управление закупками (заказы на поставку и выставление счетов)
 Module42Name=Отчет об ошибках
@@ -902,7 +902,7 @@ DictionaryVAT=Значения НДС или налога с продаж
 DictionaryRevenueStamp=Количество налоговых марок
 DictionaryPaymentConditions=Условия оплаты
 DictionaryPaymentModes=Режимы оплаты
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Тип страниц/контейнеров
 DictionaryEcotaxe=Экологический налог Ecotax (WEEE)
 DictionaryPaperFormat=Форматы бумаги
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Отчёты о местных налогах  - это ито
 LabelUsedByDefault=Метки, используемые по умолчанию, если нет перевода можно найти код
 LabelOnDocuments=Этикетка на документах
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=На конец месяца
 CurrentNext=Текущая/Следующая
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Безопасность ревизии события
-Audit=Аудит
+Audit=Security events
 InfoDolibarr=О Dolibarr
 InfoBrowser=О браузере
 InfoOS=Об ОС
@@ -1065,7 +1066,7 @@ BrowserName=Имя браузера
 BrowserOS=Операционная система браузера
 ListOfSecurityEvents=Список Dolibarr безопасность события
 SecurityEventsPurged=Безопасность событий очищены
-LogEventDesc=Вы можете включить в журнале событий безопасности Dolibarr здесь. Администраторы могут увидеть его содержимое с помощью меню <b>System Tools - Аудит.</b> Внимание, эта функция может занимать большой объем данных в базе данных.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Параметры настройки могут быть установлены только <b> пользователем администратора </b>.
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=Эта область доступна для пользователей только администратором. Ни одно из разрешений Dolibarr может снизить этот предел.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Шаг округления (для стран, где о
 UnitPriceOfProduct=Чистая цена единицы продукта
 TotalPriceAfterRounding=Общая стоимость (нетто / НДС / включая налоги) после округления
 ParameterActiveForNextInputOnly=Параметр эффективным для следующего ввода только
-NoEventOrNoAuditSetup=Нет безопасности событие было зафиксировано еще. Это может быть нормально, если проверка не была включена в "Настройка - Безопасность - аудит" страница.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=См. вашей локальной настройки Sendmail
 BackupDesc=Чтобы сделать полную резервную копию Dolibarr, Вам необходимо:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Дополнительные атрибуты (шаблон
 ExtraFieldsSupplierOrdersLines=Дополнительные атбрибуты (строки заказа)
 ExtraFieldsSupplierInvoicesLines=Дополнительные атрибуты (строки счёта)
 ExtraFieldsThirdParties=Дополнительные атрибуты (контрагенты)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Дополнительные атрибуты (Участник)
 ExtraFieldsMemberType=Дополнительные атрибуты (тип Участника)
 ExtraFieldsCustomerInvoices=Дополнительные атрибуты (Счета-Фактуры)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Список уведомлений на пользо
 ListOfNotificationsPerUserOrContact=Список уведомлений на пользователя * или на контакт **
 ListOfFixedNotifications=Список основных уведомлений
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Перейдите на вкладку «Уведомления» третьей стороны, чтобы добавлять или удалять уведомления для контактов/адресов
 Threshold=Порог
 BackupDumpWizard=Мастер создания резервной копии базы данных
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Индекс
 ##### Resource ####
 ResourceSetup=Конфигурация ресурса модуля
 UseSearchToSelectResource=Используйте форму поиска, чтобы выбрать ресурс (а не раскрывающийся список).
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index f488abe36d1..9fc5e51f0bc 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -7,7 +7,7 @@ BankName=Название банка
 FinancialAccount=Учетная запись
 BankAccount=Банковский счет
 BankAccounts=Банковские счета
-BankAccountsAndGateways=Банковские счета | Шлюзы
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Показать учётную запись
 AccountRef=Финансовые счета исх
 AccountLabel=Финансовые счета этикетки
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Счет адрес
 BankAccountCountry=Счет страны
 BankAccountOwner=Имя владельца счета
 BankAccountOwnerAddress=Адрес владельца счета
-RIBControlError=Проверка целостности значений не удается. Это означает, что информацию для этой учетной записи числа не являются полными или неправильный (проверьте стране, цифры и IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Создать аккаунт
 NewBankAccount=Новый счет
 NewFinancialAccount=Новые финансовые счета
@@ -76,6 +76,7 @@ TransactionsToConciliate=Записи для согласования
 Conciliable=Conciliable
 Conciliate=Согласительной
 Conciliation=Согласительная
+SaveStatementOnly=Save statement only
 ReconciliationLate=Согласование с запозданием
 IncludeClosedAccount=Включите закрытые счета
 OnlyOpenedAccount=Только открытые аккаунты
@@ -104,7 +105,7 @@ SocialContributionPayment=Социальный/налоговый сбор
 BankTransfer=Банковский перевод
 BankTransfers=Банковские переводы
 MenuBankInternalTransfer=Внутренний трансфер
-TransferDesc=Перевод с одной учетной записи на другую, Dolibarr напишет две записи (дебет в исходной учетной записи и кредит в целевой учетной записи. Для этой транзакции будет использована та же сумма (кроме знака), ярлык и дата)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=От
 TransferTo=К
 TransferFromToDone=<b>Передача%</b> от <b>S в% х %s%</b> S был записан.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Вы действительно хотите удал
 BankChecks=Банковские чеки
 BankChecksToReceipt=Проверки, ожидающие внесения депозита
 ShowCheckReceipt=Показать проверить депозита получения
-NumberOfCheques=Nb чеков
+NumberOfCheques=No. of check
 DeleteTransaction=Удалить запись
 ConfirmDeleteTransaction=Вы действительно хотите удалить эту запись?
 ThisWillAlsoDeleteBankRecord=Это также приведет к удалению сгенерированной записи банка
@@ -135,8 +136,8 @@ BankTransactionLine=Банковская запись
 AllAccounts=Все банковские и кассовые счета
 BackToAccount=Перейти к ответу
 ShowAllAccounts=Шоу для всех учетных записей
-FutureTransaction=Сделки в Futur. Ни в коем случае к согласительной процедуре.
-SelectChequeTransactionAndGenerate=Выбор / фильтр проверяет, включать в получении депозита проверки и нажмите кнопку &quot;Создать&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Выберите банковскую выписку, связанную с согласительной процедурой. Используйте сортируемое числовое значение: ГГГГММ или ГГГГММДД
 EventualyAddCategory=Укажите категорию для классификации записей
 ToConciliate=Согласовать?
@@ -153,7 +154,7 @@ RejectCheckDate=Дата проверки была возвращена
 CheckRejected=Проверка возобновлена
 CheckRejectedAndInvoicesReopened=Проверка возвращена, а счета-фактуры возобновлены
 BankAccountModelModule=Шаблоны документов для банковских счетов
-DocumentModelSepaMandate=Шаблон мандата SEPA. Полезно для европейских стран только в ЕЭС.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Шаблон для печати страницы с информацией о BAN.
 NewVariousPayment=Новые смешанные платежи
 VariousPayment=Смешанные платежи
@@ -162,4 +163,6 @@ ShowVariousPayment=Показать смешанные платежи
 AddVariousPayment=Добавить смешанные платежи
 SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
-FindYourSEPAMandate=Это ваш мандат SEPA, чтобы разрешить нашей компании делать прямой дебетовый заказ в ваш банк. Благодаря возврату он подписан (сканирование подписанного документа) или отправлен по почте
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 0f8d107b4a4..290662a4260 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Формальный счёт
 InvoiceProFormaDesc=<b>Формальный счёт</b> является образом оригинального счёта, но не имеет бухгалтерской учетной записи.
 InvoiceReplacement=Замена счета-фактуры
 InvoiceReplacementAsk=Замена счета-фактуры на другой
-InvoiceReplacementDesc=<b>Замена счёта</b>  используется для отмены и замены всего счёта, когда оплата по нему ещё не получена. \n<br><br> Примечание: только неоплаченные счета могут быть заменены. Если счёт, который вы заменяете, ещё не закрыт, он будет автоматически закрыт и помечен "потерянный".  
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Кредитовое авизо
 InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
-InvoiceAvoirDesc=<b>Кредитовое авизо</b> - это 'обратный' счёт, который используется для решения проблемы, когда выставлен счёт в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или  наоборот - не оплатил счёт полностью, поскольку он вернул некоторые товары).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Создать кредитное авизо со строками из оригинального счёта
 invoiceAvoirWithPaymentRestAmount=Кредитное авизо с неоплаченным остатком оригинального счёта
 invoiceAvoirLineWithPaymentRestAmount=Кредитное авизо на остаток для оплаты
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Платежи Поставщикам
 ReceivedPayments=Полученные платежи
 ReceivedCustomersPayments=Платежи, полученные от покупателей
-PayedSuppliersPayments=Платежи, отправленные поставщикам
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Полученные платежи покупателей для подтверждения
 PaymentsReportsForYear=Отчеты о платежах за %s
 PaymentsReports=Отчеты о платежах
@@ -91,8 +91,8 @@ PaymentConditionsShort=Условия платежа
 PaymentAmount=Сумма платежа
 ValidatePayment=Подтвердть платёж
 PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате
-HelpPaymentHigherThanReminderToPay=Внимание, сумма оплаты по одному или нескольким документам выше остатка к оплате. <br> Измените вашу запись, или подтвердите и подумать о создании кредитового авизо на превышения, полученные за каждый переплаченный счет-фактуру.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Классифицировать как 'Оплачен'
 ClassifyPaidPartially=Классифицировать как 'Оплачен частично'
 ClassifyCanceled=Классифицировать как 'Аннулирован'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Закрыт (неоплачен)
 BillStatusClosedPaidPartially=Оплачен (частично)
 BillShortStatusDraft=Проект
 BillShortStatusPaid=Оплачен
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Оплачено
 BillShortStatusCanceled=Аннулирован
 BillShortStatusValidated=Подтвержден
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Закрыт
 BillShortStatusClosedPaidPartially=Оплачен (частично)
 PaymentStatusToValidShort=На подтверждении
-ErrorVATIntraNotConfigured=Размер ставки НДС еще не установлен
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Режим оплаты по умолчанию не установлен. Перейдите в настройку модуля Счетов-фактур  для исправления данной ситуации.
 ErrorCreateBankAccount=Создайт банковский счет, а затем перейдите к панели настройки модуля Счетов-фактур для установки способов оплаты
 ErrorBillNotFound=Счёт %s не существует
-ErrorInvoiceAlreadyReplaced=Ошибка при попытке подтвеждения счета-фактуры, заменяющего счет-фактуру %s. Этот счет-фактура уже был заменен счетом-фактурой %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Ошибка, скидка уже используется
 ErrorInvoiceAvoirMustBeNegative=Ошибка, корректирующий счет-фактура должен иметь отрицательную сумму
 ErrorInvoiceOfThisTypeMustBePositive=Ошибка, такой тип счета-фактуры должен иметь положительную сумму
 ErrorCantCancelIfReplacementInvoiceNotValidated=Ошибка, невозможно отменить счет-фактуру, который был заменен на другой счет-фактуру, находящийся в статусе Проекта
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Оставить неоплаченной <b>(%s %s)</b> предоставленную скидку, потому что платёж был сделан перед соглашением. Я уплачу НДС с помощью кредитного авизо.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Оставить неоплаченной <b>(%s %s)</b> предоставленную скидку, потому что платёж был сделан перед соглашением. Я подтверждаю потерю НДС на этой скидке.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Оставить неоплаченной <b>(%s %s)</b> предоставленную скидку, потому что платёж был сделан перед соглашением. Я восстановлю НДС на этой скидке без кредитного авизо.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена
 ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Такой выбор возможен, только если счет-фактура был снабжен необходимым комментарием. (Например, «Только налог, соответствующий фактически уплаченной цене, дает права на вычет»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=В некоторых странах, этот выбор может быть возможным только, если ваш счет-фактура содержит правильные сведения.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Используйте этот выбор, если все остальные не подходят
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Плохой Покупатель</b> - это заказчик, который отказывается оплачивать свои долги.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Этот выбор используется при неполной оплате, когда некоторая продукция была возвращена
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Используйте этот выбор, если все остальные не подходят, например, в следующей ситуации: <br> - оплата не завершена, поскольку некоторые товары были отправлены обратно <br> - заявленная сумма очень важна, потому что скидка была забыта <br> Во всех случаях чрезмерно заявленная сумма должна быть исправлена в системе бухгалтерского учета путем создания кредитных авизо.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Другой
 ConfirmClassifyAbandonReasonOtherDesc=Этот выбор будет использоваться во всех других случаях. Например, потому, что вы планируете создать заменяющий счет-фактуру.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Подтвердить счет-фактуру
 UnvalidateBill=Unvalidate счет
-NumberOfBills=Кол-во счетов-фактур
-NumberOfBillsByMonth=Кол-во счетов-фактур по месяцам
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Сумма счетов-фактур
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Сумма счетов-фактур за месяц (за вычетом налога)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Показать счет-фактуру
@@ -260,9 +262,9 @@ Repeatables=Шаблоны
 ChangeIntoRepeatableInvoice=Конвертировать в шаблон счёта
 CreateRepeatableInvoice=Создать шаблон счёта
 CreateFromRepeatableInvoice=Создать из шаблона счёта
-CustomersInvoicesAndInvoiceLines=Счета-фактуры Покупателям и строки счетов-фактур
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Счета-фактуры Покупателям и платежи
-ExportDataset_invoice_1=Счета-фактуры Покупателям и строки счетов-фактур
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Счета-фактуры Покупателям и платежи
 ProformaBill=Встречный вексель:
 Reduction=Сокращение
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Адрес выставления
-HelpEscompte=Эта скидка предоставлена Покупателю за досрочный платеж.
-HelpAbandonBadCustomer=От этой суммы отказался Покупатель (считается плохим клиентом) и она считается чрезвычайной потерей.
-HelpAbandonOther=От этой суммы отказались из-за ошибки (например, неправильный клиент или счет-фактура был заменен на другой)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Код платежа
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Счет-фактура не выбран
 CloneInvoice=Дублировать счет-фактуру
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Действия отключены поскольку счет-фактура был заменен
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Кол-во платежей
+DescTaxAndDividendsArea=Эта зона представляет суммарную информацию по платежам на специальные расходы. Только записи с платежами в течении фиксированного года будут показаны.
+NbOfPayments=No. of payments
 SplitDiscount=Разделить скидку на две
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Введите сумму каждой из двух частей:
-TotalOfTwoDiscountMustEqualsOriginal=Сумма двух новых скидок должна быть равна размеру первоначальной скидки.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Связанный счёт
 RelatedBills=Связанные счета-фактуры
 RelatedCustomerInvoices=Связанные счета клиента
 RelatedSupplierInvoices=Связанные счета поставщика
 LatestRelatedBill=Последний связанный счёт
-WarningBillExist=Предупреждение! Счёт (или счета) уже существуют
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Чек
 PaymentTypeShortCHQ=Чек
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Он-лайн платеж
-PaymentTypeShortVAD=Он-лайн платеж
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Проект
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Банковские реквизиты
 BankCode=Код банка
-DeskCode=Код описания
+DeskCode=Office code
 BankAccountNumber=Номер счета
-BankAccountNumberKey=Ключ
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=Номер IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=Номер BIC/SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Оплата с помощью перевод
 VATIsNotUsedForInvoice=* Неприменяемых НДС арт-293B из CGI
 LawApplicationPart1=По применению закона 80.335 от 12/05/80
 LawApplicationPart2=товары остаются в собственности
-LawApplicationPart3=продавца до полной оплаты
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=их стоимости.
 LimitedLiabilityCompanyCapital=SARL с капиталом
 UseLine=Применить
@@ -463,7 +465,7 @@ Cheques=Чеки
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=Этот %s должен быть преобразован в %s
-UsBillingContactAsIncoiveRecipientIfExist=Использовать в качестве получателя счета платежный контактный адрес клиента вместо адреса контрагента
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Показать все неоплаченные счета-фактуры
 ShowUnpaidLateOnly=Показать только просроченные неоплаченные счета-фактуры
 PaymentInvoiceRef=Оплата счета-фактуры %s
@@ -474,21 +476,22 @@ Reported=Задержан
 DisabledBecausePayments=Невозможно, поскольку есть некоторые платежи
 CantRemovePaymentWithOneInvoicePaid=Не удается удалить оплаты поскольку есть по крайней мере один счет-фактура классифицированный как 'оплачен'
 ExpectedToPay=Ожидаемые платежи
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Оплачен этим платежом
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Все счета, без остатка к оплате будут автоматически закрыты со статусом "Оплачен".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Платить
 ToMakePaymentBack=Возврат платежа
 ListOfYourUnpaidInvoices=Список неоплаченных счетов
 NoteListOfYourUnpaidInvoices=Примечание: Этот список содержит счета только тех контрагентов, которые связаны с нами, как представители по сбыту.
 RevenueStamp=Штамп о уплате налогов
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Шаблон Счета-фактуры Crabe. Полный шаблон (вспомогательные опции НДС, скидки, условия платежей, логотип и т.д. ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Функция возвращает номер в формате %syymm-nnnn  для стандартных счетов и %syymm-nnnn для кредитных авизо, где yy год,  mm месяц и nnnn является непрерывной последовательностью и не возвращает 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Счёт удалён
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 2374aeab2ab..3be1c68edc8 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Показать компании
 ShowStock=Показать склад
 DeleteArticle=Нажмите, чтобы удалить эту статью
 FilterRefOrLabelOrBC=Поиск (ссылке/метке)
-UserNeedPermissionToEditStockToUsePos=Вы просите уменьшить запас на складе при создании счёта, поэтому пользователь, использующий POS-терминал, должен иметь права доступа для редактирования запаса на складе.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Точка продаж
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index 3a77c19df98..0016a1c5b31 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Телефонный звонок
 ActionAC_FAX=Отправить факс
 ActionAC_PROP=Отправить предложение по Email
 ActionAC_EMAIL=Отправить электронное письмо
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Встречи
 ActionAC_INT=Вмешательство на сайте
 ActionAC_FAC=Отправить платежную
@@ -72,8 +73,8 @@ StatusProsp=Проспект статус
 DraftPropals=Проект коммерческих предложений
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ru_RU/dict.lang b/htdocs/langs/ru_RU/dict.lang
index 7f59ed81357..5cc5233dca5 100644
--- a/htdocs/langs/ru_RU/dict.lang
+++ b/htdocs/langs/ru_RU/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Остров Херд и Макдональд
 CountryVA=Папский Престол (Государство-город Ватикан)
 CountryHN=Гондурас
 CountryHK=Гонконг
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Индия
 CountryID=Индонезия
 CountryIR=Иран
@@ -131,7 +131,7 @@ CountryKI=Кирибати
 CountryKP=Северная Корея
 CountryKR=Южная Корея
 CountryKW=Кувейт
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Лаосский
 CountryLV=Латвия
 CountryLB=Ливан
@@ -160,7 +160,7 @@ CountryMD=Молдова
 CountryMN=Монголия
 CountryMS=Монтсеррат
 CountryMZ=Мозамбик
-CountryMM=Birmania (Мьянма)
+CountryMM=Myanmar (Burma)
 CountryNA=Намибия
 CountryNR=Науру
 CountryNP=Непал
@@ -223,7 +223,7 @@ CountryTO=Тонга
 CountryTT=Тринидад и Тобаго
 CountryTR=Турция
 CountryTM=Туркменистан
-CountryTC=Теркс и Cailos острова
+CountryTC=Turks and Caicos Islands
 CountryTV=Тувалу
 CountryUG=Уганда
 CountryUA=Украина
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Маврикий рупий
 CurrencySingMUR=Маврикий рупия
 CurrencyNOK=Норвежских крон
-CurrencySingNOK=Норвежская крона
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=TND
 CurrencySingTND=Тунисский динар
 CurrencyUSD=Доллары США
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Из уст в уста
 DemandReasonTypeSRC_PARTNER=Партнер
 DemandReasonTypeSRC_EMPLOYEE=Сотрудник
 DemandReasonTypeSRC_SPONSORING=Спонсорство
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Формат 4A0
 PaperFormatEU2A0=Формат 2A0
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 09496b101ae..75f3092ad49 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Кол-во документов в директории
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Директория
 ECMSectionManual=Директория в ручном режиме
 ECMSectionAuto=Директория в автоматическом режиме
@@ -34,6 +34,8 @@ ECMDocsByProjects=Документы, связанные с проектрами
 ECMDocsByUsers=Документы, связанные с пользователями
 ECMDocsByInterventions=Документы, связанные с меропрятиями
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Директория не создана
 ShowECMSection=Показать директорию
 DeleteSection=Удаление директории
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 8410bb51245..266c8640f6b 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=Ошибка SOAP-клиента '%s'
 ErrorGlobalVariableUpdater5=Не выбрана глобальная переменная
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Обязательные параметры не определены
diff --git a/htdocs/langs/ru_RU/help.lang b/htdocs/langs/ru_RU/help.lang
index 9f55a171152..e28a5f74611 100644
--- a/htdocs/langs/ru_RU/help.lang
+++ b/htdocs/langs/ru_RU/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Поддержка через Интернет в реал
 OtherSupport=Другие виды поддержки
 ToSeeListOfAvailableRessources=Связаться/Смотреть имеющиеся ресурсы:
 HelpCenter=Справочный центр
-DolibarrHelpCenter=Центр справки и поддержки Dolibarr
-ToGoBackToDolibarr=В противном случае, нажмите <a href="%s">здесь, чтобы использовать Dolibarr</a>
-TypeOfSupport=Источник поддержки
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Сообщество (бесплатно)
 TypeSupportCommercial=Коммерческая
 TypeOfHelp=Тип
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Эффективность
 TypeHelpOnly=Только справка
 TypeHelpDev=Справка + Разработка
-TypeHelpDevForm=Справка + Разработка + Создание
-ToGetHelpGoOnSparkAngels1=Некоторые компании могут обеспечить быструю (иногда неотложную) и более эффективную онлайн поддержку путем удаленного управления компьютером. Такие помощники могут быть найдены на веб-сайте <b>%s</b>:
-ToGetHelpGoOnSparkAngels3=Вы также можете перейти к списку всех доступных тренеров Dolibarr, для этого нажмите на кнопку
-ToGetHelpGoOnSparkAngels2=Иногда, нет доступной в данный момент компании, удовлетворяющей вашему поиски. Попробуйте изменить фильтр поиска на "все доступные", так Вы сможете отправить больше заявок.
-BackToHelpCenter=В противном случае, нажмите здесь, чтобы вернуться <a href="%s">обратно к главной странице Справочного центра</a>.
-LinkToGoldMember=Вы можете позвонить одному из отобранных тренеров Dolibarr на вашем языке (%s), выбрав его Виджет (статус и максимальная цена звонка обновляются автоматически):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Поддерживаемые языки
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 2cfbc577e50..9dd4adb55e0 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Отдел кадров
-Holidays=Отпуска
-CPTitreMenu=Отпуска
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Ежемесячная выписка
 MenuAddCP=New leave request
-NotActiveModCP=Вы должны включить модуль "Отпуска" для просмотра этой страницы
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Подать заявление на отпуск
 DateDebCP=Начальная дата
 DateFinCP=Конечная дата
@@ -15,18 +15,18 @@ ApprovedCP=Утверждено
 CancelCP=Отменено
 RefuseCP=Отказано
 ValidatorCP=Утвердивший
-ListeCP=Список отпусков
+ListeCP=List of leave
 LeaveId=Leave ID
 ReviewedByCP=Will be approved by
 UserForApprovalID=User for approval ID
-UserForApprovalFirstname=Firstname of approval user
-UserForApprovalLastname=Lastname of approval user
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login of approval user
 DescCP=Описание
 SendRequestCP=Создать заявление на отпуск
 DelayToRequestCP=Заявления об отпуске могут создаваться не ранее чем через <b>%s</b> (дней)
-MenuConfCP=Balance of leaves
-SoldeCPUser=График отпусков  <b>%s</b> дней.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
 ErrorIDFicheCP=Возникла ошибка, заявление на отпуск отсутствует.
@@ -101,8 +101,8 @@ LEAVE_SICK=Sick leave
 LEAVE_OTHER=Other leave
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Обновлено успешно
 Module27130Name= Управление заявлениями на отпуск
 Module27130Desc= Управление заявлениями на отпуск
@@ -112,7 +112,7 @@ NoticePeriod=Период уведомления
 HolidaysToValidate=Подтверждение заявления на отпуск
 HolidaysToValidateBody=Ниже список заявлений на отпуск, которые требуют подтверждения
 HolidaysToValidateDelay=Это заявление на отпуск будет рассмотрено в период менее, чем %s дней.
-HolidaysToValidateAlertSolde=У пользователя, который оставил это заявление на отпуск нет достаточного количество доступных дней. 
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Подтверждённые заявления на отпуск
 HolidaysValidatedBody=Ваше заявление на отпуск с  %s по %s  подтверждено.
 HolidaysRefused=Заявление отклонено.
@@ -121,4 +121,9 @@ HolidaysCanceled=Отменённые заявления на отпуск
 HolidaysCanceledBody=Ваше заявление на отпуск с  %s по %s отменено. 
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index e2171a9e4ef..057fd799c8a 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Мы постарались сделать установку Dolibarr настолько простой, насколько это возможно. Просто следуйте инструкциям по установке, шаг за шагом.
 MiscellaneousChecks=Проверка системных требований
 ConfFileExists=Файл <b>конфигурации %s</b> существует.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Файл <b>конфигурации %s</b> не существует и не может быть создан!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Файл <b>конфигурации %s</b> может быть создан.
-ConfFileIsNotWritable=Файл <b>конфигурации %s</b> недоступен для записи. Проверьте права доступа. Для первой установки, Ваш веб-сервер должен быть предоставлен чтобы иметь права доступа для записи в этот файл во время всего процесса установки ( Используйте команду "сhmod" в ОС типа Unix, c маской 666).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Файл <b>конфигурации %s</b> доступен для записи.
 ConfFileMustBeAFileNotADir=Файл конфигурации <b>%s</b> должен быть файлом, а не каталогом.
-ConfFileReload=Перезагрузить всю информацию из файла конфигурации.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Эта версия PHP поддерживает сессии.
 PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
-PHPSupportPOSTGETKo=Возможно,  ваша версия PHP не поддерживает переменные и POST или GET. Проверьте параметр <b>variables_order</b> в php.ini.
-PHPSupportGD=Эта версия PHP  поддерживает библиотеку.
-PHPSupportCurl=Эта поддержка PHP Curl.
-PHPSupportUTF8=Эта версия PHP поддерживает UTF8 функции.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен <b>в %s.</b> Это должно быть достаточно.
-PHPMemoryTooLow=Ваш PHP макс сессии памяти установлен <b>в %s</b> байт. Это должно быть слишком низким. Измените свой <b>php.ini</b> установить параметр <b>memory_limit,</b> по крайней <b>мере %s</b> байт.
-Recheck=Нажмите здесь для более significative тест
-ErrorPHPDoesNotSupportSessions=Ваш PHP установки не поддерживает сессии. Эта функция требует, чтобы Dolibarr работает. Проверьте настройки PHP.
-ErrorPHPDoesNotSupportGD=Ваш PHP установки не поддерживает графические функции GD. Нет графике будет иметься в наличии.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Ваша установка PHP не поддерживает Curl.
-ErrorPHPDoesNotSupportUTF8=Ваш PHP установки не поддерживает UTF8 функций. Dolibarr не может работать корректно. Решать эту перед установкой Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Каталог %s не существует.
-ErrorGoBackAndCorrectParameters=Перейти назад и исправить неправильные параметры.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Вы ввели неправильное значение для параметра ' %s'.
 ErrorFailedToCreateDatabase=Не удается создать базу данных ' %s'.
 ErrorFailedToConnectToDatabase=Не удалось подключиться к базе данных ' %s'.
 ErrorDatabaseVersionTooLow=Версия базы данных (%s) слишком старая. Требуется версия %s или выше
 ErrorPHPVersionTooLow=Версия PHP слишком стара. Версия %s обязательна.
-ErrorConnectedButDatabaseNotFound=Подключение к серверу базы данных, но успешным ' %s' не найден.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=База данных ' %s' уже существует.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Если база данных не существует, вернитесь назад и проверьте параметр "Создать базу данных".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Если база данных уже существует, вернитесь назад и снимите флажок "Создать базу данных" вариант.
-WarningBrowserTooOld=Слишком старая версия браузера. Настоятельно рекомендуем обновить до свежей версии Firefox, Chrom или Opera
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Версия PHP
 License=Использование лицензии
 ConfigurationFile=Файл конфигурации
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr База данных
 DatabaseType=Тип Базы данных
 DriverType=Тип драйвера
 Server=Сервер
-ServerAddressDescription=Имя или IP-адрес сервера баз данных, как правило, 'локальный', когда сервер базы данных размещается на одном сервере, чем веб-сервер
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=База данных сервера порт. Держите пустым, если неизвестно.
 DatabaseServer=Сервер базы данных
 DatabaseName=Название базы данных
-DatabasePrefix=Таблица базы данных префиксов
-AdminLogin=Логин Dolibarr для администратора базы данных. Держите пустым, если вы подключаетесь в анонимном
-PasswordAgain=Введите пароль еще раз
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Пароль Dolibarr для администратора базы данных. Держите пустым, если вы подключаетесь в анонимном
 CreateDatabase=Создание базы данных
-CreateUser=Создать владельца или предоставить ему разрешение на базу данных
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=База данных - Superuser доступа
-CheckToCreateDatabase=Флажок, если база данных не существует, и должен быть создан. <br> В этом случае, вы должны заполнить логин и пароль для учетной записи суперпользователя в нижней части этой страницы.
-CheckToCreateUser=Установите флажок, если владелец базы данных не существует и должен быть создан, или если он существует, но база данных не существует и разрешения должны быть предоставлены. <br> В этом случае вы должны выбрать свой логин и пароль, а также заполнить логин / пароль для учетной записи суперпользователя внизу этой страницы. Если этот флажок не установлен, база данных владельца и его пароли должны существовать.
-DatabaseRootLoginDescription=Войти на пользователя разрешается создавать новые базы данных и новых пользователей, бесполезны, если ваша база данных, и ваша база данных логин уже существует (например, когда вы Хостинг провайдер веб-хостинга).
-KeepEmptyIfNoPassword=Оставьте пустым, если пользователь не имеет пароля (избежать этого)
-SaveConfigurationFile=Сохранить значения
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Сервер связи
 DatabaseCreation=Создание базы данных
 CreateDatabaseObjects=Создание объектов базы данных
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Создать внешние ключи и индекс
 OtherKeysCreation=Создание внешних ключей и индексов
 FunctionsCreation=Функции создания
 AdminAccountCreation=Создание логина Администратора
-PleaseTypePassword=Пожалуйста, введите пароль, пустые пароли не допускаются!
-PleaseTypeALogin=Пожалуйста, введите логин!
-PasswordsMismatch=Пароли отличаются, пожалуйста, попробуйте еще раз!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Окончание установки
 SystemIsInstalled=Эта установка завершена.
 SystemIsUpgraded=Dolibarr был обновлен успешно.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Вам нужно настроить Dolibarr, что
 AdminLoginCreatedSuccessfuly=Администратор входа в систему Dolibarr '<b>%s</b>' создан успешно.
 GoToDolibarr=Перейти к Dolibarr
 GoToSetupArea=Перейти к Dolibarr (настройка область)
-MigrationNotFinished=Версия базы данных не совсем в курсе, так что вам придется запустить процесс обновления еще раз.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Перейти на страницу снова обновить
 WithNoSlashAtTheEnd=Без слеша "/" в конце
-DirectoryRecommendation=Det er recommanded å bruke en ut av ditt katalogen av websidene dine.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Уже существует
 DolibarrAdminLogin=Dolibarr администратора
-AdminLoginAlreadyExists=Dolibarr администратора учетной записи <b>' %s'</b> уже существует.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Не удалось создать учетную запись администратора Dolibarr.
-WarningRemoveInstallDir=Предупреждение, по соображениям безопасности после того, как установить или обновить завершено, Вы должны удалить <b>каталог или переименовать его в install.lock во избежание ее злонамеренного использования.</b>
-FunctionNotAvailableInThisPHP=Не доступно в текущей версии PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Выбранная перенести скрипт
 DataMigration=Перенос данных (данные)
 DatabaseMigration=Перенос базы данных (структура + некоторые данные)
 ProcessMigrateScript=Сценарий обработки
 ChooseYourSetupMode=Выберите режим настройки и нажмите кнопку "Пуск" ...
 FreshInstall=Свежие установить
-FreshInstallDesc=Используйте этот режим, если это ваш первый установке. Если нет, то этот режим можно восстановить предыдущий неполной установке, но если вы хотите обновить версию, выберите "Обновить" режиме.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Обновление
 UpgradeDesc=Используйте этот режим, если вы заменили старый Dolibarr файлы с файлами из новой версии. Это позволит обновить базу данных и данных.
 Start=Главная
 InstallNotAllowed=Установка не разрешено <b>conf.php</b> разрешений
 YouMustCreateWithPermission=Вы должны создать файл %s и установить запись по этому вопросу для веб-сервера во время установки.
-CorrectProblemAndReloadPage=Просьба решить эту проблему, и нажмите F5, чтобы перезагрузить страницу.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Уже мигрировали
 DatabaseVersion=Версия Базы данных
 ServerVersion=Версия сервера базы данных
 YouMustCreateItAndAllowServerToWrite=Вы должны создать этот каталог и позволит веб-серверу, чтобы написать на ней.
 DBSortingCollation=Характер сортировки
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Вы спросите для создания базы <b>данных %s,</b> но для этого, Dolibarr необходимо подключиться к <b>серверу %s</b> с супер <b>пользователя% с</b> разрешениями.
-YouAskLoginCreationSoDolibarrNeedToConnect=Вы спросите для создания базы данных <b>логин %s,</b> но для этого, Dolibarr необходимо подключиться к <b>серверу %s</b> с супер <b>пользователя% с</b> разрешениями.
-BecauseConnectionFailedParametersMayBeWrong=В связи неудачу, принимающих или супер пользователем параметров должно быть не так.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphelins оплаты обнаружена методом %s
 RemoveItManuallyAndPressF5ToContinue=Удалите ее вручную и нажмите F5, чтобы продолжить.
 FieldRenamed=Поле переименовано
-IfLoginDoesNotExistsCheckCreateUser=Если вход не существует еще, вы должны проверить опцию "Создать пользователя"
-ErrorConnection=Сервер <b>" %s",</b> имя базы данных <b>" %s",</b> логин <b>" %s",</b> или базы данных паролей могут быть неправильными или PHP версии клиента может быть слишком стар, по сравнению с версией базы данных.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Anbefalt valget å installere versjon <b>%s</b> fra din nåværende versjonen <b>%s</b>
 InstallChoiceSuggested=<b>Установить выбор предложенной установки.</b>
-MigrateIsDoneStepByStep=Целевых версия (%s) имеет разрыв в несколько версий, поэтому мастер установки вернется предложить следующий миграции раз этот будет завершен.
-CheckThatDatabasenameIsCorrect=Sjekk at database navn <b>"%s"</b> er korrekt.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Hvis dette navnet er riktig, og at databasen ikke eksisterer ennå, du må sjekke alternativet "Opprett database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Du merket "Opprett database". For dette, må du oppgi brukernavn / passord av superbruker (nederst på skjemaet).
-YouAskToCreateDatabaseUserSoRootRequired=Du merket "Opprett database eier". For dette, må du oppgi brukernavn / passord av superbruker (nederst på skjemaet).
-NextStepMightLastALongTime=Gjeldende trinn kan vare i flere minutter. Vennligst vent til neste skjermbildet vises helt før du fortsetter.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrer frakt for kundeordrer oppbevaring
 MigrationShippingDelivery=Oppgrader lagring av shipping
 MigrationShippingDelivery2=Oppgrader lagring av shipping 2
 MigrationFinished=Миграция завершена
-LastStepDesc=<strong>Последний шаг:</strong> Определить здесь Логин и пароль, которые вы планируете использовать для подключения к программному обеспечению. Как не потерять эту, как это внимание, чтобы управлять всеми другими.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Активировать модуль %s
 ShowEditTechnicalParameters=Показать расширенные параметры (для опытных пользователей)
-WarningUpgrade=Предупреждение:\nПервый запуск базы данных?\nЭто настоятельно рекомендуется: например, из-за некоторых ошибок в системах баз данных (например, mysql версии 5.5.40 / 41/42/43) некоторые данные или таблицы могут быть потеряны во время этого процесса, поэтому настоятельно рекомендуется иметь полный дамп вашей базы данных перед началом миграции.\n\nНажмите «ОК», чтобы начать процесс миграции ...
-ErrorDatabaseVersionForbiddenForMigration=Версия вашей СУБД %s. Она содержит критическую ошибку, которая приводит к потере данных, если вы меняете структуру БД, как это требуется в процессе миграции. По этой причине, перенос не будет осуществлён до момента, пока вы не обновите вашу СУБД до работоспособной версии (версии с критическими ошибками %s)
-KeepDefaultValuesWamp=Вы можете использовать мастер настройки DoliWamp, поэтому ценности предлагаемого здесь уже оптимизирован. Изменить их только, если вы знаете, что вы делаете.
-KeepDefaultValuesDeb=Du bruker Dolibarr konfigurasjonsveiviseren fra en Ubuntu eller Debian-pakke, så verdiene foreslått her allerede er optimalisert. Bare passordet til databasen eieren til å opprette må fullføres. Endre andre parametere bare hvis du vet hva du gjør.
-KeepDefaultValuesMamp=Вы можете использовать мастер настройки DoliMamp, поэтому ценности предлагаемого здесь уже оптимизирован. Изменить их только, если вы знаете, что вы делаете.
-KeepDefaultValuesProxmox=Вы можете использовать мастер установки из Dolibarr прибор Proxmox виртуальные, поэтому значения предлагаемых здесь уже оптимизированы. Изменение их, только если вы знаете, что вы делаете.
-UpgradeExternalModule=Запустить выделенный процесс обновления внешних модулей
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Задайте по крайней мере один параметр в качестве параметра в URL-адресе. Например:  '...repair.php?standard=confirmed'
 NothingToDelete=Ничего не нужно очищать/удалять
 NothingToDo=Нечего делать
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Контракт коррекция данных
 MigrationContractsNumberToUpdate=%s договора (ов) для обновления
 MigrationContractsLineCreation=Создание линии по контракту контракт исх %s
 MigrationContractsNothingToUpdate=Нет более вещи делать
-MigrationContractsFieldDontExist=Поле fk_facture не существует больше. Ничего делать.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Контракт пустую дату коррекции
-MigrationContractsEmptyDatesUpdateSuccess=Успешная коррекция даты
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Ни один контракт не пустой даты исправить
 MigrationContractsEmptyCreationDatesNothingToUpdate=Нет контракта дата создания исправить
 MigrationContractsInvalidDatesUpdate=Плохо стоимости контракта дата коррекции
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Поставка обновлений
 MigrationStockDetail=Обновление запасов стоимость товаров
 MigrationMenusDetail=Обновление динамического меню таблицы
 MigrationDeliveryAddress=Обновить адрес для доставки грузов в
-MigrationProjectTaskActors=Data migrering for llx_projet_task_actors bord
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migrering feltet fk_user_resp av llx_projet å llx_element_contact
 MigrationProjectTaskTime=Oppdater tid i sekunder
 MigrationActioncommElement=Обновление данных о действиях
 MigrationPaymentMode=Миграция данных для оплаты режим
 MigrationCategorieAssociation=Миграция категорий
-MigrationEvents=Перенос событий для добавления владельца в таблицу присваиванья
-MigrationEventsContact=Миграция событий для добавления события контакта в таблицу присваивания
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Обновить значение поля объекта llx_societe_remise
 MigrationRemiseExceptEntity=Обновить значение поля объекта llx_societe_remise_except
 MigrationUserRightsEntity=Обновить значение поля объекта llx_user_rights
 MigrationUserGroupRightsEntity=Обновить значение поля объекта llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Перегрузите модуль %s
 MigrationResetBlockedLog=Сбросить модуль BlockedLog для алгоритма v7
-ShowNotAvailableOptions=Показать недоступные опции
-HideNotAvailableOptions=Скрыть недоступные опции
-ErrorFoundDuringMigration=Ошибка была зарегистрирована во время процесса миграции, поэтому следующий шаг недоступен. Чтобы игнорировать ошибки, вы можете <a href="%s">щелкнуть здесь</a>, но приложение или некоторые функции могут работать некорректно до фиксированного.
-YouTryInstallDisabledByDirLock=Приложение попытается выполнить обновление, но установка/обновление страниц были отключены по соображениям безопасности (каталог переименован в .lock-суффикс). <br>
-YouTryInstallDisabledByFileLock=Приложение попытается выполнить обновление, но установка/обновление страниц страниц были отключены по соображениям безопасности (по файлу блокировки <strong>install.lock</strong> в каталоге документов dolibarr). <br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Нажмите здесь, чтобы перейти к вашей заявке
-ClickOnLinkOrRemoveManualy=Нажмите следующую ссылку и, если вы всегда видите эту страницу, вы должны удалить файл install.lock в каталог документов вручную
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 98245cb1ebf..978cb720cc9 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Контакты для этого контрагента к
 ContactsAddressesForCompany=Контакты/Адреса для этого контрагента
 AddressesForCompany=Адреса для этого контарагента
 ActionsOnCompany=Действия для этого контрагента
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=События этого участника
 ActionsOnProduct=События об этом продукте
 NActionsLate=% с опозданием
@@ -847,9 +848,9 @@ ModuleBuilder=Создатель Модуля
 SetMultiCurrencyCode=Настройка валюты
 BulkActions=Массовые действия
 ClickToShowHelp=Нажмите для отображения подсказок
-WebSite=Веб-сайт
+WebSite=Website
 WebSites=Веб-сайты
-WebSiteAccounts=Учетные записи веб-сайтов
+WebSiteAccounts=Website accounts
 ExpenseReport=Отчёт о затратах
 ExpenseReports=Отчёты о затратах
 HR=Кадры
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Файл, общий доступ по ссылке
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 4152e657dab..a2855b66be8 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Связанные объект
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Название
 WEBSITE_DESCRIPTION=Описание
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
index 5359bd74783..839cc8237bf 100644
--- a/htdocs/langs/ru_RU/paybox.lang
+++ b/htdocs/langs/ru_RU/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Настройка модуля PayBox
 PayBoxDesc=Этот модуль предложить страниц, чтобы платеж по <a href="http://www.paybox.com" target="_blank">Paybox</a> клиентами. Это может быть использовано для свободного платежа или за плату по тому или иному объекту Dolibarr (счетов-фактур, порядка, ...)
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
-WelcomeOnPaymentPage=Добро пожаловать на наш интернет-платежей службы
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=На этом экране можно сделать онлайн-платежей для %s.
 ThisIsInformationOnPayment=Это данные по оплате делать
 ToComplete=Для завершения
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL предложить %s онлайн 
 ToOfferALinkForOnlinePaymentOnContractLine=URL предложить% интернет-платежей с интерфейсом пользователя на контракт линия
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL предложить% интернет-платежей с пользовательским интерфейсом для свободного сумму
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL предложить оплаты %s онлайн пользовательский интерфейс для членов подписки
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Вы также можете добавить URL параметр И <b>тег= <i>значение</i></b> для любой из этих URL (требуется только для свободного платежа), чтобы добавить свой комментарий оплаты метки.
-SetupPayBoxToHavePaymentCreatedAutomatically=Настройте PayBox с <b>URL %s</b> иметь платежей создается автоматически, когда подтверждено paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Эта страница подтверждает, что ваш платеж был записан. Спасибо.
-YourPaymentHasNotBeenRecorded=Вы платеж не был записан и сделка была отменена. Спасибо.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Счет параметры
 UsageParameter=Использование параметров
 InformationToFindParameters=Помогите найти %s информацию об учетной записи
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 7303b4e0918..760d8c4eacc 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Подпись (в законопроекте)
 PropalStatusNotSigned=Не подписал (закрытые)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Черновик
-PropalStatusValidatedShort=Утверждена
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Закрытые
 PropalStatusSignedShort=Подпись
 PropalStatusNotSignedShort=Не подписано
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Пропал% не найдены
 AddToDraftProposals=Добавить проект коммерческого предложения
 NoDraftProposals=Нет проектов коммерческих дредложений
 CopyPropalFrom=Создание коммерческого предложения, копируя существующие предложения
-CreateEmptyPropal=Создайте пустую коммерческих предложений vierge либо из списка товаров / услуг
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=По умолчанию коммерческого предложения действительности продолжительность (в днях)
-UseCustomerContactAsPropalRecipientIfExist=Используйте адрес клиента, если определено, вместо третьей стороной решения, как предложение, адрес получателя
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Клон коммерческого предложения
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Абонентский отдел след
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Полный текст предложения модели (logo. ..)
+DocModelCyanDescription=Полный текст предложения модели (logo. ..)
 DefaultModelPropalCreate=Создание модели по умолчанию
 DefaultModelPropalToBill=Шаблон по умолчанию, когда закрывается коммерческое предложение (для создания счёта)
 DefaultModelPropalClosed=Шаблон по умолчанию, когда закрывается коммерческое предложение (не оплаченное)
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 8526f5b8fd9..3741a4956a3 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Код
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -13,22 +13,24 @@ WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -37,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Читать
 WritePerm=Write
@@ -46,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Учетные записи веб-сайтов
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -74,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -84,3 +88,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 17bc8dfbc10..7b48adec8a9 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funkcia zakázaný v demo
 FeatureAvailableOnlyOnStable=Táto možnosť je dostupná iba v oficiálnej stabilnej verzií
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Iba prvky z <a href="%s">povolených modulov</a> sú uvedené.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Viac modulov na stiahnutie môžete nájst na internete
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-moduly náradie
 ModuleFamilyExperimental=Experimentálne moduly
 ModuleFamilyFinancial=Finančné moduly (Účtovníctvo / Treasury)
 ModuleFamilyECM=Elektronický Redakčný motora (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu manipulátory
 MenuAdmin=Menu Editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Používatelia a skupiny
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Firmy a správu kontaktov (zákazníci, vyhliadky ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Obchodné
 Module2Desc=Obchodné riadenie
 Module10Name=Účtovníctvo
@@ -501,7 +501,7 @@ Module23Desc=Sledovanie spotreby energií
 Module25Name=Zákazníckych objednávok
 Module25Desc=Zákazníka riadenie
 Module30Name=Faktúry
-Module30Desc=Faktúra a dobropis riadenie pre zákazníkov. Faktúra konania pre dodávateľov
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dodávatelia
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Sadzby DPH alebo Sociálnej dane
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Podmienky platby
 DictionaryPaymentModes=Metódy platby
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ekologická daň
 DictionaryPaperFormat=Papierový formát
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label používa v predvolenom nastavení, pokiaľ nie je preklad možno nájsť kód
 LabelOnDocuments=Štítok na dokumenty
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Na konci mesiaca
 CurrentNext=Aktuálny/Nasledujúci
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Udalosti bezpečnostný audit
-Audit=Audit
+Audit=Security events
 InfoDolibarr=O Dolibarre
 InfoBrowser=O prehliadači
 InfoOS=O OS
@@ -1065,7 +1066,7 @@ BrowserName=Meno prehliadača
 BrowserOS=OS prehliadača
 ListOfSecurityEvents=Zoznam Dolibarr udalostí zabezpečenia
 SecurityEventsPurged=Bezpečnostnej akcie očistil
-LogEventDesc=Môžete povoliť tu zapisovanie udalostí Dolibarr zabezpečenia. Správcovia môžu potom vidieť jeho obsah pomocou <b>nástrojov systému</b> menu <b>- audit.</b> Pozor, táto funkcia môže spotrebovať veľké množstvo dát v databáze.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informácie je rôzne technické informácie získate v režime iba pre čítanie a viditeľné len pre správcov.
 SystemAreaForAdminOnly=Táto oblasť je k dispozícii pre správcu užívateľa. Žiadny z Dolibarr oprávnenia môže znížiť tento limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Čistá jednotková cena produktu
 TotalPriceAfterRounding=Celková cena (bez DPH / s DPH / s DPH) po zaokrúhlení
 ParameterActiveForNextInputOnly=Parameter efektívne pre ďalší vstup iba
-NoEventOrNoAuditSetup=Žiadna udalosť zabezpečenia bol zaznamenaný ešte. To môže byť normálne, ak audit nebol povolený &quot;Nastavenie - Zabezpečenie - auditu&quot; stránky.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Pozrite sa na miestne sendmail nastavenie
 BackupDesc=Ak chcete vykonať kompletnú zálohu Dolibarr, musíte:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Doplnkové hodnoty ( riadky objednávky ) 
 ExtraFieldsSupplierInvoicesLines=Doplnkové hodnoty ( riadky faktúry ) 
 ExtraFieldsThirdParties=Doplnkové atribúty (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Doplnkové atribúty (člen)
 ExtraFieldsMemberType=Doplnkové atribúty (člen typ)
 ExtraFieldsCustomerInvoices=Doplnkové atribúty (faktúry)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Zoznam upozornení podľa užívateľa
 ListOfNotificationsPerUserOrContact=Zoznam upozornení podľa užívateľa alebo podľa zmluvy
 ListOfFixedNotifications=Zoznam fixnych upozornení
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Maximálna hodnota
 BackupDumpWizard=Pomocník pre databázovú zálohu
 SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli : 
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zips
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 2c4aaf63a77..008fcbd5526 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -7,7 +7,7 @@ BankName=Názov banky
 FinancialAccount=Účet
 BankAccount=Bankový účet
 BankAccounts=Bankové účty
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Zobraziť účet
 AccountRef=Finančný účet ref
 AccountLabel=Finančný účet štítok
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Účtovné adresa
 BankAccountCountry=Účet krajiny
 BankAccountOwner=Majiteľ účtu Názov
 BankAccountOwnerAddress=Majiteľ účtu adresa
-RIBControlError=Kontrola integrity hodnôt zlyhá. To znamená, že informácie v tomto čísle účtu nie sú úplné alebo zle (zistiť krajinu, čísla a IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Vytvoriť účet
 NewBankAccount=Nový účet
 NewFinancialAccount=Nový finančný účet
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Môže byť porovnaná
 Conciliate=Zmieriť
 Conciliation=Zmierenie
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Zahrnúť uzatvorených účtov
 OnlyOpenedAccount=Iba otvorené účty
@@ -104,7 +105,7 @@ SocialContributionPayment=Platba sociálnej/fiškálnej dane
 BankTransfer=Bankový prevod
 BankTransfers=Bankové prevody
 MenuBankInternalTransfer=Interný prevod
-TransferDesc=Prevod z jedného účtu na druhý, Dolibarr zapíše dva záznamy ( debet na zdrojovom účte a kredit na cieľovom účte. Rovnaká suma, názov a čas budú použité )
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Transfer z <b>%s</b> na <b>%s</b> %s <b>%s</b> zo bol zaznamenaný.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Určite chcete zmazať túto potvrdenku ?
 BankChecks=Bankové šeky
 BankChecksToReceipt=Šeký čakajúce na zaplatenie
 ShowCheckReceipt=Zobraziť skontrolovať depozitné potvrdenie
-NumberOfCheques=Nb šeku
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Späť na účte
 ShowAllAccounts=Zobraziť pre všetky účty
-FutureTransaction=Transakcie v Futur. Žiadny spôsob, ako sa zmieriť.
-SelectChequeTransactionAndGenerate=Výber / filter, aby kontroly zahŕňali do obdržaní šeku vkladov a kliknite na &quot;Vytvoriť&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Zvoľte výpis z účtu  potrebný pre náhľad. Zoraďťe podľa číselnej hodnoty YYYYMM alebo YYYYMMDD
 EventualyAddCategory=Nakoniec určiť kategóriu, v ktorej chcete klasifikovať záznamy
 ToConciliate=Na zlúčenie ?
@@ -153,7 +154,7 @@ RejectCheckDate=Dátum kedy bol šek odmietnutý
 CheckRejected=Šek vrátený
 CheckRejectedAndInvoicesReopened=Šek vrátený a faktúra znova otvorená
 BankAccountModelModule=Šablóny dokumentov pre bankové účty
-DocumentModelSepaMandate=Šablóny SEPA. Užitočné iba pre krajiny v EEC
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Šablóna pre tlač strany s BAN informáciami
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 453e2a0382d..eb6d8d1d264 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktúra
 InvoiceProFormaDesc=<b>Proforma faktúra</b> je obraz skutočnej faktúry, ale nemá evidencia hodnotu.
 InvoiceReplacement=Náhradné faktúra
 InvoiceReplacementAsk=Náhradné faktúra faktúry
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Dobropis
 InvoiceAvoirAsk=Dobropis opraviť faktúru
-InvoiceAvoirDesc=<b>Dobropis</b> je negatívny faktúra slúži na riešenie skutočnosť, že faktúra je množstvo, ktoré sa líšia ako suma skutočne vyplatená (pretože zákazník zaplatil príliš veľa omylom, alebo nebude vyplatená úplne, pretože on sa vrátil niektoré výrobky, napríklad).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Platené späť
 DeletePayment=Odstrániť platby
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Dodávatelia platby
 ReceivedPayments=Prijaté platby
 ReceivedCustomersPayments=Platby prijaté od zákazníkov
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Prijaté platby zákazníci overujú
 PaymentsReportsForYear=Platby správy pre %s
 PaymentsReports=Platby správy
@@ -91,8 +91,8 @@ PaymentConditionsShort=Platobné podmienky
 PaymentAmount=Suma platby
 ValidatePayment=Overenie platby
 PaymentHigherThanReminderToPay=Platobné vyššia než upomienke na zaplatenie
-HelpPaymentHigherThanReminderToPay=Pozor, výška platby z jedného alebo viacerých účtov je vyššia ako vo zvyšku platiť. <br> Upravte položky, inak potvrdí a premýšľať o vytvorenie dobropisu preplatku dostane pre každú preplatku faktúry.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikáciu &quot;Zaplatené&quot;
 ClassifyPaidPartially=Klasifikovať &quot;Platené čiastočne&quot;
 ClassifyCanceled=Klasifikovať &quot;Opustené&quot;
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Uzavretá (neplatené)
 BillStatusClosedPaidPartially=Platené (čiastočne)
 BillShortStatusDraft=Návrh
 BillShortStatusPaid=Platený
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Platený
 BillShortStatusCanceled=Opustený
 BillShortStatusValidated=Overené
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zatvorené
 BillShortStatusClosedPaidPartially=Platené (čiastočne)
 PaymentStatusToValidShort=Ak chcete overiť
-ErrorVATIntraNotConfigured=Intracommunautary DIČ zatiaľ nie je definovaný
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Žiadna predvolený platobný režim definovaný. Prejsť na faktúry module nastavení to opraviť.
 ErrorCreateBankAccount=Vytvorte si bankový účet, potom prejdite na nastavenia panela faktúr modulu definovať platobných režimov
 ErrorBillNotFound=Faktúra %s neexistuje
-ErrorInvoiceAlreadyReplaced=Chyba pokuse o overenie faktúru nahradiť faktúry %s. Ale tento bol už nahradený faktúre %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Chyba zľava už používa
 ErrorInvoiceAvoirMustBeNegative=Chyba musí byť správna faktúra mať zápornú čiastku
 ErrorInvoiceOfThisTypeMustBePositive=Chyba musí byť tento typ faktúry majú kladné hodnoty
 ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nemožno zrušiť, ak faktúra, ktorá bola nahradená inou faktúru, ktorá je stále v stave návrhu
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akcie na faktúre
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad zákazník
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty čiastočne vrátil
 ConfirmClassifyPaidPartiallyReasonOther=Suma opustená iného dôvodu
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Táto voľba je možné, ak faktúra boli opatrené vhodným komentárom. (Príklad &quot;Iba daň zodpovedajúcu cene, ktorá bola skutočne zaplatená dáva práva na odpočet&quot;)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=V niektorých krajinách by táto voľba byť možné iba vtedy, ak faktúra obsahuje správnu nôtu.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Použite túto voľbu, ak všetky ostatné nesluší
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Zlý zákazník</b> je zákazník, ktorý odmietne zaplatiť svoj ​​dlh.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Táto voľba sa používa, keď platba nie je kompletná, pretože niektoré z výrobkov boli vrátené
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Použite túto voľbu, ak všetky ostatné nehodí, napríklad v nasledujúcej situácii: <br> - Platba nie je kompletná, pretože niektoré výrobky boli odoslané späť <br> - Nároky suma príliš dôležité, pretože zľava bola zabudnutá <br> Vo všetkých prípadoch, čiastku cez nárokovanej musí byť opravený v systéme evidencie vytvorením dobropisu.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Ostatné
 ConfirmClassifyAbandonReasonOtherDesc=Táto voľba sa používa vo všetkých ostatných prípadoch. Napríklad preto, že máte v pláne vytvoriť nahrádzajúci faktúru.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Overiť faktúru
 UnvalidateBill=Unvalidate faktúru
-NumberOfBills=Nb faktúr
-NumberOfBillsByMonth=Nb faktúr mesiace
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Výška faktúr
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Výška faktúr mesačne (bez dane)
 ShowSocialContribution=Zobrazit sociálnu/fiškálnu daň
 ShowBill=Zobraziť faktúru
@@ -260,9 +262,9 @@ Repeatables=Šablóny
 ChangeIntoRepeatableInvoice=Previesť na šablónu faktúry
 CreateRepeatableInvoice=Vytvoriť šablónu faktúry
 CreateFromRepeatableInvoice=Vytvoriť zo šablóny faktúry
-CustomersInvoicesAndInvoiceLines=Zákazníkov faktúry a faktúra je vedenie
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Zákazníkov faktúry a platby
-ExportDataset_invoice_1=Zákazník faktúry a faktúra je zoznam liniek
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Zákazníkov faktúry a platby
 ProformaBill=Proforma Bill:
 Reduction=Zníženie
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill adresa
-HelpEscompte=Táto zľava je zľava poskytnutá zákazníkovi, pretože jej platba bola uskutočnená pred horizonte.
-HelpAbandonBadCustomer=Táto suma bola opustená (zákazník povedal, aby bol zlý zákazník) a je považovaný za výnimočný voľné.
-HelpAbandonOther=Táto suma bola opustená, pretože došlo k chybe (chybný zákazník alebo faktúra nahradený iný napríklad)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Sociálna/fiškálna daň ID
 PaymentId=Platba id
 PaymentRef=Platobná referencia
@@ -321,22 +323,22 @@ InvoiceNotChecked=Nie je vybraná žiadna faktúra
 CloneInvoice=Klon faktúru
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Akcia zakázané, pretože faktúra bola nahradená
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb platieb
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Rozdeliť zľavu v dvoch
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Vstupná hodnota pre každú z dvoch častí:
-TotalOfTwoDiscountMustEqualsOriginal=Celkom dva nové zľavy musí byť rovný pôvodnú sumu zľavy.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Súvisiace faktúra
 RelatedBills=Súvisiace faktúry
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Poznámka platby
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Kontrola
 PaymentTypeShortCHQ=Kontrola
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line platby
-PaymentTypeShortVAD=On line platby
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Návrh
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bankové spojenie
 BankCode=Kód banky
-DeskCode=Stôl kód
+DeskCode=Office code
 BankAccountNumber=Číslo účtu
-BankAccountNumberKey=Kľúč
+BankAccountNumberKey=Check digits
 Residence=Inkaso
-IBANNumber=IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT číslo
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Platba prevodom na bankový účet
 VATIsNotUsedForInvoice=* Neuplatňuje DPH art-293B CGI
 LawApplicationPart1=Návrhom zákona 80,335 z 12.05.80
 LawApplicationPart2=Tovar zostáva majetkom
-LawApplicationPart3=predávajúci až do úplnej preplatenie
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=ich cena.
 LimitedLiabilityCompanyCapital=SARL s kapitálom
 UseLine=Platiť
@@ -463,7 +465,7 @@ Cheques=Kontroly
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Použitie zákazníkov fakturačnú kontaktnú adresu miesto adresy tretích strán ako príjemcu u faktúr
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Zobraziť všetky neuhradené faktúry
 ShowUnpaidLateOnly=Zobraziť neskoré neuhradené faktúry len
 PaymentInvoiceRef=%s faktúru
@@ -474,21 +476,22 @@ Reported=Oneskorený
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Predpokladaný platba
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Zaplatené touto platbou
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Zaplatiť
 ToMakePaymentBack=Oplatiť
 ListOfYourUnpaidInvoices=Zoznam nezaplatených faktúr
 NoteListOfYourUnpaidInvoices=Poznámka: Tento zoznam obsahuje iba faktúry pre tretie strany si sú prepojené ako obchodného zástupcu.
 RevenueStamp=Kolek
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Zmazať šablónu faktúrý
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Faktúra zmazaná
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index d25ddfaba61..0649f1633ab 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Zobraziť spoločnosť
 ShowStock=Zobraziť skladu
 DeleteArticle=Kliknutím odstránite tento článok
 FilterRefOrLabelOrBC=Vyhľadávanie (Ref / Label)
-UserNeedPermissionToEditStockToUsePos=Žiadate o zníženie skladu pri vytvorení faktúry, užívateľ pouzívajúci POS musí mať povolenie upravovať sklad.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr tlačiareň bločkov
+PointOfSale=Bod predaja
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
index d568369d081..364b33eb7b7 100644
--- a/htdocs/langs/sk_SK/commercial.lang
+++ b/htdocs/langs/sk_SK/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefónny hovor
 ActionAC_FAX=Odoslať fax
 ActionAC_PROP=Poslať e-mailom návrh
 ActionAC_EMAIL=Odoslať e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Schôdza
 ActionAC_INT=Zásah na stránke
 ActionAC_FAC=Poslať zákazníka faktúru poštou
@@ -72,8 +73,8 @@ StatusProsp=Prospect stav
 DraftPropals=Navrhnúť obchodné návrhy
 NoLimit=Bez limitu
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sk_SK/dict.lang b/htdocs/langs/sk_SK/dict.lang
index a20f900306e..36278a2eecb 100644
--- a/htdocs/langs/sk_SK/dict.lang
+++ b/htdocs/langs/sk_SK/dict.lang
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Severná Kórea
 CountryKR=Južná Kórea
 CountryKW=Kuvajt
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Lotyšsko
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavsko
 CountryMN=Mongolsko
 CountryMS=Monserrat
 CountryMZ=Mozambik
-CountryMM=Birmania (Mjanmarsko)
+CountryMM=Myanmar (Burma)
 CountryNA=Namíbia
 CountryNR=Nauru
 CountryNP=Nepál
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad a Tobago
 CountryTR=Turecko
 CountryTM=Turkménsko
-CountryTC=Turks a Cailos ostrovy
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Maurícius rupia
 CurrencySingMUR=Maurícius rupia
 CurrencyNOK=Nórske Krones
-CurrencySingNOK=Nórska koruna
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tuniských dinárov
 CurrencySingTND=Tuniský dinár
 CurrencyUSD=Americké doláre
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zamestnanec
 DemandReasonTypeSRC_SPONSORING=Sponzoring
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Formát 4A0
 PaperFormatEU2A0=Formát 2A0
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index 54ca11128af..33f3dcc9f12 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb dokumentov v adresári
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Adresár
 ECMSectionManual=Ručné Directory
 ECMSectionAuto=Automatické adresár
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenty súvisiace s projektmi
 ECMDocsByUsers=Dokumenty súvisiace s používateľmi
 ECMDocsByInterventions=Dokumenty súvisiace so zákrokom.
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No vytvoril adresár
 ShowECMSection=Zobraziť adresár
 DeleteSection=Odstráňte adresár
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 15596697da4..4afdf927bed 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/help.lang b/htdocs/langs/sk_SK/help.lang
index e3a362464bf..a59ed9fea66 100644
--- a/htdocs/langs/sk_SK/help.lang
+++ b/htdocs/langs/sk_SK/help.lang
@@ -6,8 +6,8 @@ OtherSupport=Ďalšia podpora
 ToSeeListOfAvailableRessources=Ak chcete kontaktovať / zobrazenie dostupných zdrojov:
 HelpCenter=Nápoveda centrum
 DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Inak kliknite <a href="%s">tu využiť Dolibarr</a>
-TypeOfSupport=Zdrojom podpory
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Spoločenstva (zadarmo)
 TypeSupportCommercial=Obchodné
 TypeOfHelp=Typ
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Účinnosť
 TypeHelpOnly=Nápoveda iba
 TypeHelpDev=Nápoveda + Development
-TypeHelpDevForm=Pomoc + + Development Formation
-ToGetHelpGoOnSparkAngels1=Niektoré spoločnosti môžu poskytnúť rýchly (niekedy okamžitej) a efektívnejšiu online podporu tým, že vezme kontrolu nad vašim počítačom. Tieto pomocníkmi možno nájsť na internetových stránkach <b>%s:</b>
-ToGetHelpGoOnSparkAngels3=Môžete tiež prejsť na zoznam všetkých dostupných vozidiel pre Dolibarr, pre túto kliknutím na
-ToGetHelpGoOnSparkAngels2=Niekedy nie je spoločnosť k dispozícii v okamihu, keď vykonáte vyhľadávanie, tak si pre zmenu filter sa pozrieť na &quot;všetky dostupnosť&quot;. Budete mať možnosť posielať viac požiadaviek.
-BackToHelpCenter=V opačnom prípade, choďte späť <a href="%s">vrátiť na pomoc strednej domovskú stránku</a> .
-LinkToGoldMember=Môžete zavolať jednu z predvolených trénera o Dolibarr pre požadovaný jazyk (%s) kliknutím na jeho widget (stav a maximálna cena automaticky aktualizované):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Podporované jazyky
-SubscribeToFoundation=Nápoveda Dolibarr projekt, prihláste sa do základu
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Oficiálna podpora Dolibarr vo Vašom jayzku: 
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 90da146dda5..50fbcef66eb 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Mesačný výkaz
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Dátum začatia
 DateFinCP=Dátum ukončenia
@@ -15,13 +15,18 @@ ApprovedCP=Schválený
 CancelCP=Zrušený
 RefuseCP=Odmietol
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Popis
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Musíte vybrať koncový dátum je väčší ako dátum začatia.
 ErrorSQLCreateCP=SQL chyba pri tvorbe:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Informácie Workflow
 RequestByCP=Žiadosť
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Upraviť
 DeleteCP=Vymazať
 ActionRefuseCP=Odmietnuť
@@ -59,6 +71,7 @@ DateRefusCP=Dátum odmietnutia
 DateCancelCP=Dátum zrušenia
 DefineEventUserCP=Priradenie výnimočnú dovolenku pre užívateľa
 addEventToUserCP=Priradenie opustiť
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Dôvod
 UserCP=Užívateľ
 ErrorAddEventToUserCP=Došlo k chybe pri pridávaní výnimočnú dovolenku.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Aktualizované úspešne.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 36baca36fab..39886435369 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Stačí sledovať inštrukcie krok za krokom.
 MiscellaneousChecks=Kontrola predpokladov
 ConfFileExists=Konfiguračný súbor <b>%s</b> existuje.
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> Konfiguračný súbor neexistuje a nemohol byť vytvorený!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=<b>%s</b> Konfiguračný súbor môže byť vytvorený.
-ConfFileIsNotWritable=<b>%s</b> Konfiguračný súbor nie je zapisovateľný. Skontrolujte oprávnenia. Pri prvej inštalácii musí byť Váš webový server schopný zapisovať do tohto súboru počas procesu konfigurácie (napr. &quot;chmod 666&quot; na Unixe, a pod.).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfiguračný súbor <b>%s</b> je zapisovatelný.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Aktualizuj všetky informácie z konfiguračného súboru.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Vaše PHP podporuje relácie.
 PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a GET.
-PHPSupportPOSTGETKo=Je možné, že vaša inštalácia PHP nepodporuje premenné POST a / alebo GET. Skontrolujte parameter <b>variables_order</b> v php.ini.
-PHPSupportGD=Vaše PHP podporuje grafické funkcie GD .
-PHPSupportCurl=PHP podporuje Curl
-PHPSupportUTF8=Vaše PHP podporuje funkcie UTF8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. To by malo stačiť.
-PHPMemoryTooLow=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. Môže to byť príliš málo.Upravte súbor <b>php.ini</b> a nastavte parameter <b>memory_limit</b> aspoň na hodnotu <b>%s</b> bajtov.
-Recheck=Kliknite sem pre viac signifikantný test
-ErrorPHPDoesNotSupportSessions=Vaša inštalácia PHP nepodporuje relácie. Táto funkcia je nutná, aby Dolibarr fungoval. Skontrolujte vaše nastavenia PHP.
-ErrorPHPDoesNotSupportGD=Vaša inštalácia PHP nepodporuje grafické funkcie GD. Grafy nebudú k dispozícii.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Vaše nainštalované PHP nepodporuje Curl
-ErrorPHPDoesNotSupportUTF8=Vaša inštalácia PHP nepodporuje funkcie UTF8. Dolibarr nemôže pracovať správne. Pred inštaláciou Dolibarr treba tento problém vyriešiť.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Adresár %s neexistuje.
-ErrorGoBackAndCorrectParameters=Choďte späť a opravte chybné parametre.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Možno ste zadali nesprávnu hodnotu pre parameter &quot;%s&quot;.
 ErrorFailedToCreateDatabase=Nepodarilo sa vytvoriť databázu &quot;%s&quot;.
 ErrorFailedToConnectToDatabase=Nepodarilo sa pripojiť k databáze &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Verzia databázy (%s) je príliš stará. Vyžaduje sa verzia %s alebo vyššia.
 ErrorPHPVersionTooLow=Verzia PHP je príliš stará. Vyžaduje sa verzia %s.
-ErrorConnectedButDatabaseNotFound=Pripojenie k serveru úspešné, ale databáza &quot;%s&quot; sa nenašla.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Databáza '%s' už existuje.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ak databáza neexistuje, vráťte sa späť a zaškrtnite voľbu &quot;Vytvoriť databázu&quot;.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ak databáza už existuje, vráťte sa späť a zrušte začiarknutie políčka &quot;Vytvoriť databázu&quot;.
-WarningBrowserTooOld=Príliš stará verzia prehliadača. Aktualizácia prehliadača na poslednú verziu Firefoxu, Chrome alebo Opery je vysoko odporúčaná.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Verzia PHP
 License=Používa sa licencia
 ConfigurationFile=Konfiguračný súbor
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr databáza
 DatabaseType=Typ databázy
 DriverType=Typ ovládača
 Server=Server
-ServerAddressDescription=Názov alebo IP adresa databázového servera, zvyčajne &quot;localhost&quot;, keď je databázový server umiestnený na rovnakom serveri, ako web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Port databázového servera. Nechajte prázdne, ak je neznámy.
 DatabaseServer=Databázový server
 DatabaseName=Názov databázy
-DatabasePrefix=Prefix tabuliek databázy
-AdminLogin=Prihlásenie pre vlastníka databázy Dolibarr.
-PasswordAgain=Zadajte heslo ešte raz
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Heslo pre vlastníka databázy Dolibarr.
 CreateDatabase=Vytvoriť databázu
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Databázový server - prístup Superuser
-CheckToCreateDatabase=Zaškrtnite, ak databáza neexistuje a musí byť vytvorená.<br>V tom prípade musíte zadať prihlasovacie meno / heslo pre administrátora v dolnej časti tejto stránky.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Prihlásenie užívateľa oprávneného vytvárať nové databázy alebo nových užívateľov - povinné, ak vaša databáza alebo jej majiteľ ešte neexistuje.
-KeepEmptyIfNoPassword=Ponechajte prázdne, ak užívateľ nemá heslo (neodporúčané)
-SaveConfigurationFile=Uložiť hodnoty
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Pripojenie k serveru
 DatabaseCreation=Vytvorenie databázy
 CreateDatabaseObjects=Tvorba objektov databázy
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Vytvorte cudzie kľúče a indexy pre tabuľky %s
 OtherKeysCreation=Cudzie kľúče a indexy tvorba
 FunctionsCreation=Funkcia vytvárania
 AdminAccountCreation=Administrator login tvorba
-PleaseTypePassword=Prosím, zadajte heslo, prázdne heslá nie je dovolené!
-PleaseTypeALogin=Prosím zadajte prihláste sa!
-PasswordsMismatch=Heslá sa líši, skúste to znova!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Koniec nastavenie
 SystemIsInstalled=Táto inštalácia je dokončená.
 SystemIsUpgraded=Dolibarr bol aktualizovaný úspešne.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Je potrebné nakonfigurovať Dolibarr aby vyhovoval va
 AdminLoginCreatedSuccessfuly=Dolibarr administrátorský účet '<b>%s</b>' úspešne vytvorený
 GoToDolibarr=Prejsť na Dolibarr
 GoToSetupArea=Prejsť na Dolibarr (nastavenie plochy)
-MigrationNotFinished=Verzia databázy nie je úplne aktuálna, takže budete musieť spustiť proces aktualizácie znova.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Prejsť na stránku znova upgradovať
 WithNoSlashAtTheEnd=Bez lomítka &quot;/&quot; na koniec
-DirectoryRecommendation=Je odporúčané používať adresár mimo adresára zo svojich webových stránok.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Už existuje
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr účtu správcu <b>&quot;%s</b> 'už existuje. Vráť sa, ak chcete vytvoriť ďalšie.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Vytvorenie Dolibarr administratórskeho účtu zlyhalo
-WarningRemoveInstallDir=Pozor, z bezpečnostných dôvodov, akonáhle inštaláciu alebo upgrade je kompletný, aby sa zabránilo používanie inštaláciu nástroja znova, mali by ste pridať súbor s názvom <b>install.lock</b> do adresára dokumentov Dolibarr, aby sa zabránilo škodlivému využitie.
-FunctionNotAvailableInThisPHP=Nie je k dispozícii na tejto PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Vyberte si skript migrácie
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skript pre spracovanie
 ChooseYourSetupMode=Vyberte si režim inštalácie a kliknite na tlačidlo &quot;Štart&quot; ...
 FreshInstall=Čerstvá inštalácia
-FreshInstallDesc=Tento režim použite, ak je to vaša prvá inštalácia. Ak nie, môžete tento režim opraviť neúplnú predchádzajúcu inštaláciu, ale ak chcete upgradovať verziu, vyberte &quot;Upgrade&quot; režime.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Vylepšiť
 UpgradeDesc=Tento režim použite, ak ste vymenili staré Dolibarr súbory sa súbory z novšej verzie. To bude aktualizovať databázy a dáta.
 Start=Začiatok
 InstallNotAllowed=Inštalácia nie je povolené <b>conf.php</b> oprávnenia
 YouMustCreateWithPermission=Musíte vytvoriť súbor %s a nastaviť povolenia na zápis na tom webovom serveri počas procesu inštalácie.
-CorrectProblemAndReloadPage=Opravte problém a stlačte klávesu F5 pre obnovenie stránky.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Už sa sťahoval
 DatabaseVersion=Verzia databázy
 ServerVersion=Databázový server verzia
 YouMustCreateItAndAllowServerToWrite=Musíte vytvoriť tento adresár a umožniť pre webový server zapisovať do neho.
 DBSortingCollation=Znak triedením
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Pýtate sa, na vytvorenie databázy <b>%s,</b> ale k tomu, Dolibarr musíte sa pripojiť k serveru <b>%s</b> sa super užívateľských oprávnení <b>%s.</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=Pýtate sa, na vytvorenie databázy <b>%s</b> prihlásenie, ale za to, Dolibarr musíte sa pripojiť k serveru <b>%s</b> sa super užívateľských oprávnení <b>%s.</b>
-BecauseConnectionFailedParametersMayBeWrong=Ako pripojenie zlyhalo, musí hostiteľ alebo superpoužívateľ parametre mýliť.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Siroty platba detegované metódou %s
 RemoveItManuallyAndPressF5ToContinue=Odstrániť ručne a stlačte klávesu F5 pokračovať.
 FieldRenamed=Pole premenovaný
-IfLoginDoesNotExistsCheckCreateUser=Ak prihlásenie nie je ešte neexistuje, je nutné skontrolovať voľbu &quot;Vytvoriť užívateľa&quot;
-ErrorConnection=Server <b>&quot;%s&quot;</b> Názov databázy <b>&quot;%s&quot;</b> login <b>&quot;%s&quot;,</b> alebo heslo databázy môže byť zle, alebo PHP verzia klienta môže byť príliš starý oproti verzii databázy.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Odporúčaná voľba pre inštaláciu verzie <b>%s</b> od aktuálnej verzie <b>%s</b>
 InstallChoiceSuggested=<b>Nainštalujte voľbou navrhol inštaláciu.</b>
-MigrateIsDoneStepByStep=Cielená verzia (%s) má medzeru niekoľkých verziách, takže inštalácia Sprievodca vráti navrhnúť ďalšiu migráciu raz toto bude dokončená.
-CheckThatDatabasenameIsCorrect=Skontrolujte, či je názov databázy <b>&quot;%s&quot;</b> je správna.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Ak to je správny názov a databázy doteraz neexistuje, musíte skontrolovať voľbu &quot;Vytvoriť databázu&quot;.
 OpenBaseDir=PHP OpenBasedir parametrov
-YouAskToCreateDatabaseSoRootRequired=Pýtali ste sa okno &quot;Vytvoriť databázu&quot;. Za týmto účelom je potrebné poskytnúť login / heslo superpoužívateľa (v spodnej časti formulára).
-YouAskToCreateDatabaseUserSoRootRequired=Pýtali ste sa okno &quot;Vytvoriť vlastníka databázy&quot;. Za týmto účelom je potrebné poskytnúť login / heslo superpoužívateľa (v spodnej časti formulára).
-NextStepMightLastALongTime=Aktuálny krok môže trvať niekoľko minút. Počkajte prosím, kým sa zobrazí ďalšia obrazovka úplne pred pokračovaním.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrácia prepravu pre ukladanie zákazníckych objednávok
 MigrationShippingDelivery=Aktualizujte skladovanie lodnej dopravy
 MigrationShippingDelivery2=Aktualizujte skladovaní dopravy 2
 MigrationFinished=Migrácia dokončená
-LastStepDesc=<strong>Posledný krok:</strong> Definujte tu prihlasovacie meno a heslo budete používať pre pripojenie k softvéru. Nestrácajte to, ako to je účet, spravovať všetky ostatné.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktivácia modulu %s
 ShowEditTechnicalParameters=Kliknite tu pre zobrazenie / editovať pokročilé parametre (expertný režim)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Verzia Vašej databázy je %s. Obsahuje kritickú chybu spôsobujúcu stratu dát v prípade zmeny štruktúry databázy; takáto zmena je však migračným procesom vyžadovaná. Migrácia preto nebude povolená kým si nezaktualizujete svoju databázu na vyššiu, opravenú verziu. (Zoznam známych chybných verzií: %s)
-KeepDefaultValuesWamp=Používate Dolibarr inštalátor z DoliWamp čiže hodnoty sú už optimalizované. Zmenite ich iba v prípade, že viete čo robíte.
-KeepDefaultValuesDeb=Používate Dolibarr inštalátor z Linux balíčka (Ubuntu, Debian, Fedora...), čiže hodnoty sú už optimalizované. Iba nastavenia hesla databáze su potrebné. Ostatné parametrezmente iba v prípade, že viete čo robíte.
-KeepDefaultValuesMamp=Používate Dolibarr inštalátor z DoliMamp čiže hodnoty sú už optimalizované. Zmenite ich iba v prípade, že viete čo robíte.
-KeepDefaultValuesProxmox=Používate Dolibarr inštalátor z Proxmox čiže hodnoty sú už optimalizované. Zmenite ich iba v prípade, že viete čo robíte.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrácia dát na komerčné návrhov
 MigrationInvoice=Migrácia dát pre zákazníka faktúry
 MigrationContract=Migrácia dát pre zmluvy
-MigrationSuccessfullUpdate=Upgrade úspešný
+MigrationSuccessfullUpdate=Aktualizujte úspešná
 MigrationUpdateFailed=Nepodarilo proces upgradu
 MigrationRelationshipTables=Migrácia dát pre vzťah tabuliek (%s)
 MigrationPaymentsUpdate=Platba korekcia dát
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Zmluva korekcia dát
 MigrationContractsNumberToUpdate=%s zmluva (y) aktualizovať
 MigrationContractsLineCreation=Vytvorte riadku zmluvy pre %s zmluvných ref
 MigrationContractsNothingToUpdate=Žiadne ďalšie vecí, ktoré sa
-MigrationContractsFieldDontExist=Pole fk_facture neexistuje už nie. Čo robiť.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Zmluva prázdna dáta korekcia
-MigrationContractsEmptyDatesUpdateSuccess=Úprava hodnoty úspešná
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Žiadna zmluva prázdny Dátum opraviť
 MigrationContractsEmptyCreationDatesNothingToUpdate=Žiadna zmluva dátum vytvorenia opraviť
 MigrationContractsInvalidDatesUpdate=Bad valuty zmluva korekcia
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Dodávka aktualizácie
 MigrationStockDetail=Aktualizovať hodnotu zásob výrobkov
 MigrationMenusDetail=Aktualizácia dynamická menu tabuľky
 MigrationDeliveryAddress=Aktualizovať adresu dodania zásielky
-MigrationProjectTaskActors=Migrácia dát pre tabuľky llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migrácia dát z poľa fk_user_resp llx_projet na llx_element_contact
 MigrationProjectTaskTime=Aktualizovať čas strávený v sekundách
 MigrationActioncommElement=Aktualizovať údaje o činnosti
 MigrationPaymentMode=Migrácia dát platobného režimu
 MigrationCategorieAssociation=Migrácia kategórií
-MigrationEvents=Migrácia udalostí za účelom pridania vlastníka udalosti do priraďovacej tabuľky
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Aktualizácia hodnoty llx_societe_remise
 MigrationRemiseExceptEntity=Aktualizácia hodnoty llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Znovu načítať modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Zobraziť nedostupné možnosti
-HideNotAvailableOptions=Skryť nedostupné možnosti
-ErrorFoundDuringMigration=Počas migrácies sa vyskytol problém preto nasledujúci krok nie je dostupný. Pre ignorovanie chýb môžete <a href="%s">kliknúť tu</a>, ale niektoré funkcie aplikácie nebudu fungovať správne pokial ich neopravíte.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 1dd2df23631..7a829698002 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakty pre túto tretiu stranu
 ContactsAddressesForCompany=Kontakty / adries tretím stranám tejto
 AddressesForCompany=Adresy pre túto tretiu stranu
 ActionsOnCompany=Akcia o tejto tretej osobe
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Akcia o tomto členovi
 ActionsOnProduct=Events about this product
 NActionsLate=%s neskoro
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web stránka
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Web stránky
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index ced342507f8..88907452830 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Prepojený objekt
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Názov
 WEBSITE_DESCRIPTION=Popis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/sk_SK/paybox.lang b/htdocs/langs/sk_SK/paybox.lang
index a5748b77390..2326c18a84c 100644
--- a/htdocs/langs/sk_SK/paybox.lang
+++ b/htdocs/langs/sk_SK/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Paybox modul nastavenia
 PayBoxDesc=Tento modul ponúkajú stránky, ktoré umožnia platby na <a href="http://www.paybox.com" target="_blank">Paybox</a> zákazníkov. Toho možno využiť pre voľný platbu alebo platbu na určitý objekt Dolibarr (faktúry, objednávky, ...)
 FollowingUrlAreAvailableToMakePayments=Nasledovné adresy URL sú k dispozícii ponúknuť stránky na zákazníka, aby platbu na Dolibarr objektov
 PaymentForm=Platba formulár
-WelcomeOnPaymentPage=Vítame Vás na našej on-line platobné služby
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Táto obrazovka vám umožní vykonať on-line platbu %s.
 ThisIsInformationOnPayment=Sú to informácie o platbe robiť
 ToComplete=Ak chcete dokončiť
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL ponúknuť %s on-line platobný užív
 ToOfferALinkForOnlinePaymentOnContractLine=URL ponúknuť %s on-line platobný užívateľské rozhranie pre zmluvy linky
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL ponúknuť %s on-line platobný užívateľské rozhranie pre voľný čiastku
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ponúknuť %s on-line platobný užívateľské rozhranie pre členské predplatné
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Môžete tiež pridať parameter URL <b>&amp; tag = <i>hodnota</i></b> na niektorú z týchto URL (nutné iba pre voľný platby) pridať vlastný komentár platobnej tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Nastavte si Paybox s url <b>%s</b> mať platba vytvorená automaticky pri overená Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Táto stránka potvrdzuje, že platba bola zaznamenaná. Ďakujem.
-YourPaymentHasNotBeenRecorded=Vaša platba nebola zaznamenaná a transakcia bola zrušená. Ďakujem.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametre účtu
 UsageParameter=Používanie parametrov
 InformationToFindParameters=Pomôžte nájsť %s informácie o účte
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index d50ad95f8f6..fa1b5eeeb31 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Podpis (potreby fakturácia)
 PropalStatusNotSigned=Nie ste prihlásený (uzavretý)
 PropalStatusBilled=Účtované
 PropalStatusDraftShort=Návrh
-PropalStatusValidatedShort=Overené
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zatvorené
 PropalStatusSignedShort=Podpísaný
 PropalStatusNotSignedShort=Nie ste prihlásený
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Prepáli %s nebol nájdený
 AddToDraftProposals=Pridať do predlohy návrhu
 NoDraftProposals=Žiadne návrhy riešení
 CopyPropalFrom=Vytvorenie obchodné návrh skopírovaním existujúceho návrhu
-CreateEmptyPropal=Vytvorte prázdny obchodné návrhy vierge alebo zo zoznamu produktov / služieb
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Predvolené komerčné Návrh platnosť doba (v dňoch)
-UseCustomerContactAsPropalRecipientIfExist=Použitie zákazníkov kontaktnú adresu, ak je definovaná miesto treťou stranou adresa ako adresa príjemcu návrh
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klon obchodné návrh
 ConfirmClonePropal=Určite chcete duplikovať komerčnú ponuku <b>%s</b>?
 ConfirmReOpenProp=Určite chcete znova otvoriť komerčnú ponuku <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kontakt so zákazníkom nasledujúce vyprac
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Kompletný návrh modelu (logo. ..)
+DocModelCyanDescription=Kompletný návrh modelu (logo. ..)
 DefaultModelPropalCreate=Predvolené model, tvorba
 DefaultModelPropalToBill=Predvolená šablóna pri zatváraní obchodnej návrh (bude faktúrovať)
 DefaultModelPropalClosed=Predvolená šablóna pri zatváraní obchodnej návrh (nevyfakturované)
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index b09e03c3b1c..a060b3d43fb 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kód
-WebsiteSetupDesc=Tu vytvorte toľko riadkov kolko rôzných webstránok potrebujete. Potom choďte do menu Webstránky pre ich upravovanie.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Zmazať webstránku
-ConfirmDeleteWebsite=Určite chcete zmazať túto web stránku. Všetky podstránka a obsah budú zmazané tiež.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Meno stránky
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL alebo externý CSS dokument
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Knižnica médií
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Upraviť menu
 EditMedias=Edit medias
-EditPageMeta=Upraviť Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Náhľad webstránky <strong>%s</strong> nie je dostupný. Najprv musíte pridať stránk.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=Zobraziť stránku na novej karte
 SetAsHomePage=Nastaviť ako domovskú stránku
 RealURL=Skutočná URL
 ViewWebsiteInProduction=Zobraziť web stránku použitím domovskej URL
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Čítať
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 75b115cfd1d..9813c54b82b 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funkcija onemogočena v demo različici
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Prikazani so samo elementi <a href="%s">omogočenih modulov </a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Orodja za različne module
 ModuleFamilyExperimental=Eksperimentalni moduli
 ModuleFamilyFinancial=Finančni moduli (računovodstvo/blagajna)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menijski vmesniki
 MenuAdmin=Urejevalnik menijev
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Uporabniki & Skupine
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Upravljanje podjetij in kontaktov
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Komerciala
 Module2Desc=Upravljanje komerciale
 Module10Name=Računovodstvo
@@ -501,7 +501,7 @@ Module23Desc=Nadzor porabe energije
 Module25Name=Naročila kupcev
 Module25Desc=Upravljanje naročil kupcev
 Module30Name=Računi
-Module30Desc=Upravljanje računov in dobropisov za kupce. Upravljanje računov dobaviteljev
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dobavitelji
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Stopnje DDV ali davkov
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Pogoji plačil
 DictionaryPaymentModes=Načini plačil
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ekološka taksa (WEEE)
 DictionaryPaperFormat=Formati papirja
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Poročila o lokalnih davkih so seštevek prodajnih davkov
 LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Na koncu meseca
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Dogodki v zvezi z nadzorovanjem varnosti
-Audit=Nadzor
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Ime brskalnika
 BrowserOS=OS brskalnika
 ListOfSecurityEvents=Seznam varnostnih dogodkov Dolibarr
 SecurityEventsPurged=Varnostni dogodki očistimo
-LogEventDesc=Tukaj lahko omogočite beleženje dnevnika Dolibarr varnostnih dogodkov. Administratorji lahko vidijo njegovo vsebino preko menija <b>Sistemska orodja - Nadzor</b>. Pozor, ta funkcija lahko uporabi veliko količino podatkov iz baze.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemske informacije so raznovrstne tehnične informacije, ki so na voljo samo v bralnem načinu in jih vidi samo administrator.
 SystemAreaForAdminOnly=To področje je na voljo samo administratorju. Nobeno od Dolibarr dovoljenj ne more spremeniti teh omejitev.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Stopnja zaokrožive (v državah, kjer se zaokrožuje drug
 UnitPriceOfProduct=Neto cena enote proizvoda
 TotalPriceAfterRounding=Skupna cena z davkom po zaokrožitvi
 ParameterActiveForNextInputOnly=Parameter bo veljal šele pri naslednjem vnosu.
-NoEventOrNoAuditSetup=Do sedaj še ni bil zabeležen noben varnostno problematičen dogodek. To je lahko normalno, če ni vklopljen nadzor na strani "Nastavitve - Varnost - nadzor".
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Glejte lokalne nastavitve za pošiljanje pošte
 BackupDesc=Za izdelavo celotne Dolibarr varnostne kopije (backup), morate:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Koplementarni atributi (vrstice naročila)
 ExtraFieldsSupplierInvoicesLines=Koplementarni atributi (vrstice računi)
 ExtraFieldsThirdParties=Koplementarni atributi (partner)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Koplementarni atributi (član)
 ExtraFieldsMemberType=Koplementarni atributi (tip člana)
 ExtraFieldsCustomerInvoices=Koplementarni atributi (računi)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Seznam fiksnih obvestil
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Prag
 BackupDumpWizard=Čarovnik za ustvarjanje datoteke z varnostnimi kopijami podatkovnih baz
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index be0ea397dfe..272972f4943 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -7,7 +7,7 @@ BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Bančni račun
 BankAccounts=Bančni računi
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Referenca finančnega računa
 AccountLabel=Naziv finančnega računa
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Naslov računa
 BankAccountCountry=Država računa
 BankAccountOwner=Ime lastnika računa
 BankAccountOwnerAddress=Naslov lastnika računa
-RIBControlError=Napaka pri kontroli integritete vrednosti. To pomeni, da informacije za to številko računa niso popolne ali so napačne (preverite državo, številke in IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiranje računa
 NewBankAccount=Nov konto
 NewFinancialAccount=Nov finančni račun
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Se lahko uskladi
 Conciliate=Uskladi
 Conciliation=Uskladitev
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Vključi zaprte račune
 OnlyOpenedAccount=Samo odprti računi
@@ -104,7 +105,7 @@ SocialContributionPayment=Plačilo socialnega/fiskalnega davka
 BankTransfer=Bančni transfer
 BankTransfers=Bančni transferji
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Na
 TransferFromToDone=Zabeležen je bil transfer od <b>%s</b> na <b>%s</b> v znesku <b>%s</b> %s.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bančni čeki
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Prikaži prevzemnico čekovnih nakazil
-NumberOfCheques=Število čekov
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazaj na račun
 ShowAllAccounts=Prikaži vse račune
-FutureTransaction=Bodoča transakcija. Ni možna uskladitev.
-SelectChequeTransactionAndGenerate=Izberi/filtriraj čeke za vključitev v prevzemnico čekovnih nakazil in klikni na "Ustvari"
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira: YYYYMM ali YYYYMMDD
 EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Datum vrnitve čeka
 CheckRejected=Vrnjen ček
 CheckRejectedAndInvoicesReopened=Vrnjen ček in ponovno odprti računi
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index afdd38ab5c8..d693ecf16d3 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Predračun
 InvoiceProFormaDesc=<b>Predračun</b> izgleda enako kot račun, vendar nima računovodske vrednosti.
 InvoiceReplacement=Nadomestni račun
 InvoiceReplacementAsk=Nadomestni račun za račun
-InvoiceReplacementDesc=<b>Nadomestni račun</b> se uporablja za preklic in popolno zamenjavo računa, ki še ni bil plačan.<br><br>Opomba: Zamenja se lahko samo račun, ki še ni bil plačan. Če račun, ki ga nadomeščate, še ni bil zaključen, se bo avtomatsko zaključil, da postane 'opuščen'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Dobropis
 InvoiceAvoirAsk=Dobropis za korekcijo računa
-InvoiceAvoirDesc=<b>Dobropis</b> je negativni račun, ki se uporabi za rešitev problema, ko je znesek na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Ustvari dobropis z vrsticami iz originalnega računa
 invoiceAvoirWithPaymentRestAmount=Ustvari dobropis iz neplačanega preostanka osnovnega računa
 invoiceAvoirLineWithPaymentRestAmount=Dobropis za preostali neplačan znesek
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Vrnjeno plačilo
 DeletePayment=Brisanje plačila
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plačila dobaviteljem
 ReceivedPayments=Prejeta plačila
 ReceivedCustomersPayments=Prejeta plačila od kupcev
-PayedSuppliersPayments=Plačila, plačana dobaviteljem
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Prejeta plačila od kupcev za potrditev
 PaymentsReportsForYear=Poročilo o plačilih za %s
 PaymentsReports=Poročila o plačilih
@@ -91,8 +91,8 @@ PaymentConditionsShort=Pogoji plačil
 PaymentAmount=Znesek plačila
 ValidatePayment=Potrdi plačilo
 PaymentHigherThanReminderToPay=Plačilo višje od opomina
-HelpPaymentHigherThanReminderToPay=Pozor, plačilo zneska enega ali več računov  je višje od preostanka za plačilo. <br> Popravite vaš vnos, ali potrdite znesek in pripravite dobropise za prekoračene zneske za vsak preveč plačan račun.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označeno kot 'Plačano'
 ClassifyPaidPartially=Označeno kot 'Delno plačano'
 ClassifyCanceled=Označeno kot 'Opuščeno'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zaključeno (neplačano)
 BillStatusClosedPaidPartially=Plačano (delno)
 BillShortStatusDraft=Osnutek
 BillShortStatusPaid=Plačano
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Plačan
 BillShortStatusCanceled=Opuščeno
 BillShortStatusValidated=Potrjeno
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zaključeno
 BillShortStatusClosedPaidPartially=Plačano (delno)
 PaymentStatusToValidShort=Za potrditev
-ErrorVATIntraNotConfigured=DDV številka še ni definirana
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Ni določen privzet način plačila. Pojdite na nastavitve modula za račune.
 ErrorCreateBankAccount=Kreirajte bančni račun, zatem pojdite na področje Nastavitve za definiranje načina plačila
 ErrorBillNotFound=Račun s številko %s ne obstaja
-ErrorInvoiceAlreadyReplaced=Napaka, poskusili ste potrditi račun za zamenjavo računa %s. Vendar je ta že bil nadomeščen z računom %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Napaka, popust je bil že uporabljen
 ErrorInvoiceAvoirMustBeNegative=Napaka, na popravljenem računu mora biti negativni znesek
 ErrorInvoiceOfThisTypeMustBePositive=Napaka, ta tip računa mora imeti pozitiven znesek
 ErrorCantCancelIfReplacementInvoiceNotValidated=Napaka, ne morete preklicati računa, ki je bil zamenjan z drugim računom, ki je še v statusu osnutka
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Izdajatelj
 BillTo=Prejemnik
 ActionsOnBill=Aktivnosti na računu
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV je bil popravljen z dobropisom.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. Strinjam se z izgubo DDV zaradi tega popusta.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV na ta popust bo vrnjen brez dobropisa.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slab kupec
 ConfirmClassifyPaidPartiallyReasonProductReturned=Delno vračilo proizvodov
 ConfirmClassifyPaidPartiallyReasonOther=Znesek opuščen zaradi drugih razlogov
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ta izbira je možna, če so na računu ustrezni komentarji. (Primer »Samo davek, ki ustreza dejansko plačani ceni, omogoča možnost odbitka«)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=V nekaterih državah lahko to izberete samo, če račun vsebuje popravek.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=To izbiro uporabite, če so druge neustrezne
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Slab kupec</b> je tisti, ki ne plačuje svojih obveznosti.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ta izbira se uporabi, če plačilo ni bilo kompletno zaradi vračila nekaterih proizvodov
-ConfirmClassifyPaidPartiallyReasonOtherDesc=To izbiro uporabite, če nobena druga ne ustreza, na primer v naslednji situaciji:<br>- plačilo ni izvršeno v celoti, ker so bili nekateri proizvodi vrnjeni<br>- znesek je bil reklamiran, ker ni bil obračunan popust<br>V vseh primerih mora biti reklamiran znesek popravljen v računovodskem sistemu s kreiranjem dobropisa.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Ostalo
 ConfirmClassifyAbandonReasonOtherDesc=Ta izbira se uporabi v vseh drugih primerih. Na primer, ker planirate izdelavo nadomestnega računa.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Potrdi račun
 UnvalidateBill=Unvalidate račun
-NumberOfBills=Število računov
-NumberOfBillsByMonth=Število računov po mesecih
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Znesek račuov
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Znesek računov po mesecih (brez DDV)
 ShowSocialContribution=Prikaži socialni/fiskalni davek
 ShowBill=Prikaži račun
@@ -260,9 +262,9 @@ Repeatables=Predloge
 ChangeIntoRepeatableInvoice=Pretvori v predlogo računa
 CreateRepeatableInvoice=Ustvari predlogo računa
 CreateFromRepeatableInvoice=Ustvari iz predloge računa
-CustomersInvoicesAndInvoiceLines=Računi za kupce in vrstice v računih
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Računi za kupce in plačila
-ExportDataset_invoice_1=Seznam računov za kupce in vrstic v računih
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Računi za kupce in plačila
 ProformaBill=Predračun:
 Reduction=Znižanje
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Naslov za račun
-HelpEscompte=Ta popust je bil kupcu odobren zaradi plačila pred rokom zapadlosti.
-HelpAbandonBadCustomer=Ta znesek je bil opuščen (Kupec je označen kot 'slab kupec') in se obravnava kot potencialna izguba.
-HelpAbandonOther=Ta znesek je bil opuščen, ker je prišlo do napake (na primer napačen kupec ali račun, zamenjan z drugim)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=ID za socialni/fiskalni davek
 PaymentId=ID plačila
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Noben račun ni izbran
 CloneInvoice=Kloniraj račun
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Aktivnost onemogočena, ker je bil račun zamenjan
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Število plačil
+DescTaxAndDividendsArea=To področje predstavlja vsoto vseh plačil posebnih stroškov. Vključeni so le zapisi s plačili v določenem letu.
+NbOfPayments=No. of payments
 SplitDiscount=Razdeli popust na dva
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Vnesi znesek za vsakega od obeh delov :
-TotalOfTwoDiscountMustEqualsOriginal=Vsota obeh novih popustov mora biti enaka originalnemu znesku popustov.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Podobni račun
 RelatedBills=Povezani računi
 RelatedCustomerInvoices=Povezani računi za kupca
 RelatedSupplierInvoices=Povezani računi dobavitelja
 LatestRelatedBill=Zadnji povezan račun
-WarningBillExist=Pozor, obstaja že en ali več računov
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Orodje za spajanje PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Elektronsko plačilo
-PaymentTypeShortVAD=Elektronsko plačilo
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Osnutek
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Podatki o banki
 BankCode=Koda banke
-DeskCode=Koda blagajne
+DeskCode=Office code
 BankAccountNumber=Koda računa
-BankAccountNumberKey=Ključ
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN številka
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT številka
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Plačilo z nakazilom na naslednji bančni ra
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=Blago ostane last prodajalca
-LawApplicationPart3=do poplačila njegove celotne
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=vrednosti.
 LimitedLiabilityCompanyCapital=d.o.o. s kapitalom
 UseLine=Uporabi
@@ -463,7 +465,7 @@ Cheques=Čeki
 DepositId=ID depozita
 NbCheque=Število čekov
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Za pošiljanje računov uporabi naslov kontakta za račune pri kupcu namesto naslova partnerja
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Prikaži vse neplačane račune
 ShowUnpaidLateOnly=Prikaži samo zapadle neplačane račune
 PaymentInvoiceRef=Račun za plačilo %s
@@ -474,21 +476,22 @@ Reported=Odlog
 DisabledBecausePayments=Ni možno zaradi nekaterih odprtih plačil
 CantRemovePaymentWithOneInvoicePaid=Brisanje plačila ni možno, ker je vsaj en račun označen kot plačan
 ExpectedToPay=Pričakovano plačilo
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plačano s tem plačilom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Označi s "Plačano" vse dobropise, ki so bili v celoti vrnjeni.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Vsi računi, ki nimajo neplačanih preostankov, bodo avtomatsko zaključeni v status "Plačano".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Plačati
 ToMakePaymentBack=Vrniti plačilo
 ListOfYourUnpaidInvoices=Seznam neplačanih računov
 NoteListOfYourUnpaidInvoices=Opomba: Ta seznam vsebuje samo račune za partnerje, ki so povezani z referentom.
 RevenueStamp=Žig prihodka
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora DDV opcije, popusti, pogoji plačila, logo, itd...)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledkov in večja od 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index f2080a4f20f..48ecc51faa4 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Prikaži podjetje
 ShowStock=Prikaži skladišče
 DeleteArticle=Kliknite za izbris tega artikla
 FilterRefOrLabelOrBC=Iskanje (Referenca/Naziv)
-UserNeedPermissionToEditStockToUsePos=Zahtevali ste zmanjšanje zaloge ob izdaji računa, torej mora imeti uporabnik POS-a dovoljenje za popravljanje zaloge
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr tiskalnik računov
+PointOfSale=Prodajna mesta
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
index 4451550a05f..cc04da343da 100644
--- a/htdocs/langs/sl_SI/commercial.lang
+++ b/htdocs/langs/sl_SI/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonski klic
 ActionAC_FAX=Poslati faks
 ActionAC_PROP=Poslati ponudbo
 ActionAC_EMAIL=Poslati e-mail
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Sestanek
 ActionAC_INT=Intervencija na lokaciji
 ActionAC_FAC=Poslati račun kupcu po pošti
@@ -72,8 +73,8 @@ StatusProsp=Status možne stranke
 DraftPropals=Osnutek komercialne ponudbe
 NoLimit=Brez omejitev
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sl_SI/dict.lang b/htdocs/langs/sl_SI/dict.lang
index 33052989974..3c6dda29515 100644
--- a/htdocs/langs/sl_SI/dict.lang
+++ b/htdocs/langs/sl_SI/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Vatikan
 CountryHN=Honduras
 CountryHK=Hongkong
-CountryIS=Islandija
+CountryIS=Iceland
 CountryIN=Indija
 CountryID=Indonezija
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Severna Koreja
 CountryKR=Južna Koreja
 CountryKW=Kuvajt
-CountryKG=Kirgizija
+CountryKG=Kyrgyzstan
 CountryLA=Laos
 CountryLV=Latvija
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavija
 CountryMN=Mongolija
 CountryMS=Monserat
 CountryMZ=Mozambik
-CountryMM=Burma (Mjanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibija
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad in Tobago
 CountryTR=Turčija
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauricijske rupije
 CurrencySingMUR=Mauricijska rupija
 CurrencyNOK=Norveške krone
-CurrencySingNOK=Norveška krona
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunizijski dinarji
 CurrencySingTND=Tunizijski dinar
 CurrencyUSD=Ameriški Dolarji
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Ustno
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zaposleni
 DemandReasonTypeSRC_SPONSORING=Sponzorstvo
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index 441aefe22c2..2ee8b31c951 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Število dokumentov v mapi
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Mapa
 ECMSectionManual=Ročna mapa
 ECMSectionAuto=Avtomatska mapa
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenti, povezani s projekti
 ECMDocsByUsers=Dokumenti, povezani z uporabniki
 ECMDocsByInterventions=Dokumenti, povezani z intervencijami
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Ni kreiranih map
 ShowECMSection=Prikaži mapo
 DeleteSection=Odstrani mapo
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index c2ce303e2ee..b85473cc078 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sl_SI/help.lang b/htdocs/langs/sl_SI/help.lang
index 795d31a8ed4..2a512534f2c 100644
--- a/htdocs/langs/sl_SI/help.lang
+++ b/htdocs/langs/sl_SI/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Direktna Online podpora na daljavo v realnem času
 OtherSupport=Ostale podpore
 ToSeeListOfAvailableRessources=Za kontakt/ogled virov, ki so na voljo:
 HelpCenter=Center za pomoč
-DolibarrHelpCenter=Dolibarr center za pomoč in podporo
-ToGoBackToDolibarr=Sicer kliknite <a href="%s">tukaj za vstop v Dolibarr</a>
-TypeOfSupport=Vir za podporo
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Skupnost (brezplačno)
 TypeSupportCommercial=Komercialni
 TypeOfHelp=Tip
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Učinkovitost
 TypeHelpOnly=Samo pomoč
 TypeHelpDev=Pomoč+razvoj
-TypeHelpDevForm=Pomoč+razvoj+oblikovanje
-ToGetHelpGoOnSparkAngels1=Nekatera podjetja lahko zagotovijo hitro (včasih takojšnjo) in učinkovitejšo online podporo z direktnim dostopom do vašega računalnika. Take pomočnike lahko najdete na <b>%s</b> spletni strani:
-ToGetHelpGoOnSparkAngels3=Lahko si ogledate tudi seznam vseh Dolibarr inštruktorjev, ki so na voljo; kliknite na gumb
-ToGetHelpGoOnSparkAngels2=Včasih v trenutku vašega iskanja ni na voljo nobenega podjetja, zato lahko spremenite filter na "all availability". Tako boste lahko poslali več zahtevkov.
-BackToHelpCenter=Sicer kliknite <a href="%s">tukaj za prehod nazaj na domačo stran za pomoč</a>.
-LinkToGoldMember=Lahko pokličete enega of inštruktorjev, ki jih je Dolibarr izbral vnaprej za vaš jezik (%s) s kliko na ustrezno ikono (status in maksimalna cena se posodobita avtomatsko):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Podprti jeziki
-SubscribeToFoundation=POmagajte projektu Dolibarr z včlanitvijo v združenje
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Za uradno Dolibarr podporo v vašem jeziku: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index ad7f4d8208d..e5a183da459 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Dopusti
-CPTitreMenu=Dopusti
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Mesečno stanje
 MenuAddCP=Nov zahtevek za dopust
-NotActiveModCP=Za ogled te strani morate aktivirati modul za dopust
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Izdelaj zahtevek za dopust
 DateDebCP=Začetni datum
 DateFinCP=Končni datum
@@ -15,13 +15,18 @@ ApprovedCP=Odobreno
 CancelCP=Preklicano
 RefuseCP=Zavrnjeno
 ValidatorCP=Odobril
-ListeCP=Seznam dopustov
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Ustvari zahtevek za dopust
 DelayToRequestCP=Zahtevek za dopust mora biti vložen vsaj <b>%s dan(dni)</b> prej.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Stanje dopusta je <b>%s</b> dni.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Končni datum mora biti večji od začetnega.
 ErrorSQLCreateCP=Pri ustvarjanju SQL je prišlo do napake
 ErrorIDFicheCP=Prišlo je do napake, zahtevek za dopust ne obstaja
@@ -30,7 +35,14 @@ ErrorUserViewCP=Nimate dovoljenja za branje tega zahtevka za dopust
 InfosWorkflowCP=Pretok informacij
 RequestByCP=Zahteval
 TitreRequestCP=Zahtevek za dopust
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Število porabljenih dni dopusta
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Uredi
 DeleteCP=Izbriši
 ActionRefuseCP=Zavrnitev
@@ -59,6 +71,7 @@ DateRefusCP=Datum zavrnitve
 DateCancelCP=Datum preklica
 DefineEventUserCP=Dodeli izredno odsotnost uporabniku
 addEventToUserCP=Dodeli odsotnost
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Razlog
 UserCP=Uporabnik
 ErrorAddEventToUserCP=Prišlo je do napake pri dodajanju izredne odsotnosti.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Uspešno posodobljeno.
 Module27130Name= Upravljanje zahtevkov za dopust
 Module27130Desc= Upravljanje zahtevkov za dopust
@@ -94,7 +112,7 @@ NoticePeriod=Čas za odobritev
 HolidaysToValidate=Potrdi zahtevke za dopust
 HolidaysToValidateBody=Spodaj je zahtevek za potrditev dopustov
 HolidaysToValidateDelay=Ta zahtevek za dopust se bo izvedel v obdobju manj kot %s dni.
-HolidaysToValidateAlertSolde=Uporabnik, ki je vložil ta zahtevek za dopust, nima na voljo dovolj dni dopusta.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Potrjeni zahtevki za dopust
 HolidaysValidatedBody=Vaš zahtevek za dopust od %s do %s je bil potrjen.
 HolidaysRefused=Zahtevek je bil zavrnjen
@@ -103,4 +121,9 @@ HolidaysCanceled=Preklican zahtevek za dopust
 HolidaysCanceledBody=Vaš zahtevek za dopust od %s do %s je bil preklican.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Pojdite na <strong>Domov - Nastavitve- Slovarji- Vrste odsotnosti</strong> zanastavitve različnih vrst odsotnosti.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index b56ccd76359..d8b5411fe2d 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Sledite navodilom korak za korakom.
 MiscellaneousChecks=Kontrola pogojev
 ConfFileExists=Konfiguracijska datoteka <b>%s</b> že obstaja.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> Ne obstaja in je ni mogoče kreirati !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se lahko kreira.
-ConfFileIsNotWritable=V konfiguracijsko datoteko <b>%s</b> ni možno zapisovanje. Preverite dovoljenja. Pri prvi instalaciji mora vaš strežnik dovoljevati možnost zapisovanja v to datoteko med postopkom konfiguracije(na primer "chmod 666" na Unix in podobnih OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=V konfiguracijsko datoteka <b>%s</b> je možno zapisovanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Ponovno naložite vse informacije iz konfiguracijske datoteke.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Ta PHP podpira seje.
 PHPSupportPOSTGETOk=Ta PHP podpira spremenljivke POST in GET.
-PHPSupportPOSTGETKo=Morda vaše PHP nastavitve ne podpirajo spremenljivk POST in/ali GET. Preverite parameter <b>variables_order</b> v datoteki php.ini.
-PHPSupportGD=Ta PHP podpira GD grafične funkcije.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Ta PHP podpira UTF8 funkcije.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b>. To bi moralo zadoščati.
-PHPMemoryTooLow=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b> bytov. To je morda premalo. Spremenite datoteko <b>php.ini</b> in nastavite parameter <b>memory_limit</b> najmanj na <b>%s</b> bytov.
-Recheck=Kliknite tukaj za pomembnejše teste
-ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podpira sej. Ta funkcija je zahtevana za delovanje Dolibarr. Preverite vaše PHP nastavitve.
-ErrorPHPDoesNotSupportGD=Vaša PHP instalacija ne podpira grafične funkcije GD. Grafi ne bodo na voljo.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Vaša PHP instalacija ne podpira funkcij UTF8. Dolibarr zato ne bo mogel pravilno delovati. Zadevo rešite pred namestitvijo Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Mapa %s ne obstaja.
-ErrorGoBackAndCorrectParameters=Vrnite se nazaj in popravite napačne parametre.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Morda ste vnesli napačno vrednost parametra '%s'.
 ErrorFailedToCreateDatabase=Neuspešno kreiranje baze podatkov '%s'.
 ErrorFailedToConnectToDatabase=Neuspešna povezava z bazo podatkov '%s'.
 ErrorDatabaseVersionTooLow=Verzija baze podatkov (%s) je prestara. Zahtevana je verzija %s ali novejša.
 ErrorPHPVersionTooLow=PHP verzija je prestara. Zahtevana je verzija %s.
-ErrorConnectedButDatabaseNotFound=Povezava s strežnikom je vzpostavljena, vendar ni najdena baza podatkov'%s'.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Baza podatkov '%s' že obstaja.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Če baza podatkov ne obstaja, se vrnite nazaj in označite opcijo "Ustvari bazo podatkov".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Če baza podatkov že obstaja, se vrnite nazaj in odznačite opcijo "Ustvari bazo podatkov".
-WarningBrowserTooOld=Verzija brskalnika je prestara. Priporočamo nadgraditev vašega brskalnika na zadnjo verzijo Firefox, Chrome ali Opera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Verzija
 License=Uporablja licenco
 ConfigurationFile=Konfiguracijska datoteka
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr baza podatkov
 DatabaseType=Tip baze podatkov
 DriverType=Tip gonilnika
 Server=Strežnik
-ServerAddressDescription=Ime ali IP naslov strežnika za bazo podatkov, običajno 'localhost', če strežni baze podatkov gostuje na istem strežniku, kot spletni strežnik
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Vrata strežnika baze podatkov. Če niso znana, pustite prazno.
 DatabaseServer=Strežnik za bazo podatkov
 DatabaseName=Ime baze podatkov
-DatabasePrefix=Baza podatkov predpona miza
-AdminLogin=Uporabniško ime za lastnika Dolibarr baze podatkov.
-PasswordAgain=Ponoven vnos gesla
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Geslo za lastnika Dolibarr baze podatkov.
 CreateDatabase=Ustvari bazo podatkov
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Strežnik za bazo podatkov – »Super uporabnik« dostop
-CheckToCreateDatabase=Označite kvadratek, če baza podatkov ne obstaja in jo je potrebno ustvariti.<br>V tem primeru morate vnesti uporabniško ime/geslo za račun »Super uporabnik« na dnu te strani.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Uporabniško ime uporabnika omogoča kreiranje nove baze podatkov ali novega uporabnika, razen če vaša baza podatkov in vaše uporabniško ime že obstajata (na primer če gostujete pri spletnem ponudniku).
-KeepEmptyIfNoPassword=Pustite prazno, če uporabnik nima gesla (temu se izogibajte)
-SaveConfigurationFile=Shrani vrednosti
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Povezava s strežnikom
 DatabaseCreation=Ustvarjanje baze podatkov
 CreateDatabaseObjects=Ustvarjanje objektov baze podatkov
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Kreiranje tujih ključev in indeksov za tabelo %s
 OtherKeysCreation=Kreiranje tujih ključev in indeksov
 FunctionsCreation=Kreiranje funkcij
 AdminAccountCreation=Kreiranje uporabniškega imena za Administratorja
-PleaseTypePassword=Prosim, vnesite geslo, prazno geslo ni dovoljeno !
-PleaseTypeALogin=Prosim, vnesite uporabniško ime !
-PasswordsMismatch=Geslo ni ustrezno, prosim, poskusite znova !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Nastavitev je zaključena
 SystemIsInstalled=Ta instalacija je zaključena.
 SystemIsUpgraded=Dolibarr Je bil uspešno nadgrajen.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Dolibarr morate konfigurirati, da bi ustrezal vašim p
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Zaženi Dolibarr
 GoToSetupArea=Zaženi Dolibarr (področje nastavitev)
-MigrationNotFinished=Verzija vaše baze podatkov ni povsem posodobljena, zato boste morali ponovno pognati postopek nadgradnje.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Ponovno pojdite na stran za nadgradnjo
 WithNoSlashAtTheEnd=Brez poševnice "/" na koncu
-DirectoryRecommendation=Priporoča se uporaba mape zunaj vaše mape na vaših internetnih straneh.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Že obstaja
 DolibarrAdminLogin=Uporabniško ime Dolibarr administratorja
-AdminLoginAlreadyExists=Račun Dolibarr administratorja '<b>%s</b>' že obstaja.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Pozor, zaradi varnostnih razlogov morate po končani namestitvi ali nadgradnji odstraniti mapo <b>install<b> ali jo preimenovati v <b>install.lock</b>, da bi preprečili njeno zlonamerno uporabo.
-FunctionNotAvailableInThisPHP=Ni na voljo pri tem PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Izberite skript za selitev
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Obdelava skripta
 ChooseYourSetupMode=Izberite vaš način namestitve in kliknite "Start"...
 FreshInstall=Sveža namestitev
-FreshInstallDesc=Uporabite ta način, če je to vaša prva namestitev. Če ne, lahko na ta način popravite nepopolno predhodno namestitev. Če pa želite vašo verzijo nadgraditi, izberite način "Nadgraditev".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Nadgraditev
 UpgradeDesc=Ta način uporabite, če ste zamenjali stare Dolibarr datoteke z datotekami iz novejše različice. S tem boste nadgradili vašo bazo podatkov in podatke.
 Start=Start
 InstallNotAllowed=Namestitev ni možna zaradi dovoljenj v <b>conf.php</b>
 YouMustCreateWithPermission=Ustvariti morate datoteko %s in nastaviti dovoljenja za zapisovanje za spletni strežnik med postopkom namestitve.
-CorrectProblemAndReloadPage=Prosim, popravite težavo in pritisnite F5 za osvežitev strani.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Že prenešeno
 DatabaseVersion=Različica baze podatkov
 ServerVersion=Različica strežnika baze podatkov
 YouMustCreateItAndAllowServerToWrite=Ustvariti morate to mapo in dovoliti spletnemu strežniku zapisovanje vanjo.
 DBSortingCollation=Vrstni red znakov
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Želeli ste kreirati bazo podatkov <b>%s</b>, vendar se mora za to Dolibarr povezati s strežnikom <b>%s</b> z dovoljenji super uporabnika <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Želeli ste kreirati uporabniško ime za bazo podatkov <b>%s</b>, vendar se mora za to Dolibarr povezati s strežnikom <b>%s</b> z dovoljenji super uporabnika <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=Ker povezava ni uspela, so morda parametri gostitelja ali super uporabnika napačni.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Osamljena plačila so bila zaznana z metodo %s
 RemoveItManuallyAndPressF5ToContinue=Ročno odstranite in pritisnite F5 za nadaljevanje.
 FieldRenamed=Polje je primenovano
-IfLoginDoesNotExistsCheckCreateUser=Če uporabniško ime še ne obstaja, morate preveriti opcijo "Ustvari uporabnika"
-ErrorConnection=Strežnik "<b>%s</b>", ime baze podatkov "<b>%s</b>", uporabniško ime "<b>%s</b>", ali geslo so morda napačni ali pa je različica PHP klienta prestara v primerjavi z različico baze podatkov.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Priporočena izbira za namestitev različice <b>%s</b> iz vaše trenutne različice <b>%s</b>
 InstallChoiceSuggested=<b>Predlagana izbira namestitve</b>.
-MigrateIsDoneStepByStep=Ciljna verzija (%s) se razlikuje za nekaj verzij, zato bo instalacijski čarovnik predlagal naslednjo migracijo, ko bo trenutna zaključena.
-CheckThatDatabasenameIsCorrect=Preverite, če je ime baze podatkov "<b>%s</b>" pravilno.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Če je to ime pravilno in baza podatkov še ne obstaja, morate označiti opcijo "Ustvari bazo podatkov".
 OpenBaseDir=Parameter PHP openbasedir
-YouAskToCreateDatabaseSoRootRequired=Označili ste okvirček "Ustvari bazo podatkov". Za to morate zagotoviti uporabniško ime/geslo superuporabnika (spodnji del obrazca).
-YouAskToCreateDatabaseUserSoRootRequired=Označili ste okvirček "Ustvari lastnika baze podatkov". Za to morate zagotoviti uporabniško ime/geslo superuporabnika (spodnji del obrazca).
-NextStepMightLastALongTime=Trenutni korak bo morda trajal nekaj minut. Pred nadaljevanjem počakajte, dokler ni viden celoten prikaz naslednjega zaslona.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Prenos skladišča blaga za odpremo naročil kupcev
 MigrationShippingDelivery=Nadgraditev skladišča za odpremo
 MigrationShippingDelivery2=Nadgraditev skladišča za odpremo 2
 MigrationFinished=Prenos končan
-LastStepDesc=<strong>Zadnji korak</strong>: Tukaj določite uporabniško ime in geslo, ki ju nameravate uporabiti za priklop v software. Ne izgubite ju, ker je to račun za administriranje vseh ostalih računov.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Vključite modul %s
 ShowEditTechnicalParameters=Kliknite tukaj za prikaz/popravek naprednih parametrov (expertni način)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Verzija vaše baze podatkov je %s. Vsebuje kritičnega hrošča, ki povzroči izgubo podatkov, če naredite strukturno spremembo baze, kot jo zahteva postopek migracije. Zato migracija ne bo dovoljena, dokler ne posodobite baze na višjo stabilno verzijo (seznam znanih hroščastih verzij: %s)
-KeepDefaultValuesWamp=Za namestitev Dolibarr uporabljate čarovnika DoliWamp, zato so predlagane vrednosti že optimizirane. Spremenite jih le, če veste kaj počnete.
-KeepDefaultValuesDeb=Za namestitev Dolibarr uporabljate čarovnika iz paketov, podobnih Ubuntu ali Debian, zato so predlagane vrednosti že optimizirane. Spremenite jih le, če veste kaj počnete.
-KeepDefaultValuesMamp=Za namestitev Dolibarr uporabljate čarovnika DoliMamp, zato so predlagane vrednosti že optimizirane. Spremenite jih le, če veste kaj počnete.
-KeepDefaultValuesProxmox=Za namestitev Dolibarr uporabljate čarovnika Proxmox virtual appliance, zato so predlagane vrednosti že optimizirane. Spremenite jih le, če veste kaj počnete.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Prenos podatkov o komercialnih ponudbah
 MigrationInvoice=Prenos podatkov o računih za kupce
 MigrationContract=Prenos podatkov o pogodbah
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Nadgradnja uspešna
 MigrationUpdateFailed=Postopek nadgradnje ni uspel
 MigrationRelationshipTables=Prenos podatkov za relacijske tabele (%s)
 MigrationPaymentsUpdate=Posodobitev podatkov o plačilih
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Posodobitev podatkov o pogodbah
 MigrationContractsNumberToUpdate=%s pogodb je potrebno posodobiti
 MigrationContractsLineCreation=Ustvarite vrstico v pogodbi za pogodbo št. %s
 MigrationContractsNothingToUpdate=Nič več ni potrebno narediti
-MigrationContractsFieldDontExist=Polje fk_facture več ne obstaja. Nič več ni potrebno narediti.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Popravek manjkajočih datumov v pogodbah
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Ni potreben popravek manjkajočih datumov v pogodbah
 MigrationContractsEmptyCreationDatesNothingToUpdate=Ni potreben popravek datumov kreiranja pogodb
 MigrationContractsInvalidDatesUpdate=Popravek manjkajočih datumov v pogodbah
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Dobave so posodobljene
 MigrationStockDetail=Posodobitev vrednosti zalog proizvodov
 MigrationMenusDetail=Posodobitev tabel dinamičnih menijev
 MigrationDeliveryAddress=Posodobitev naslovov za dobavo pošiljk
-MigrationProjectTaskActors=Prenos podatkov tabele llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Prenos podatkov polja fk_user_resp tabele llx_projet v llx_element_contact
 MigrationProjectTaskTime=Posodobitev porabljenega časa v sekundah
 MigrationActioncommElement=Posodobitev podatkov o aktivnostih
 MigrationPaymentMode=Podatki, migracije za način plačila
 MigrationCategorieAssociation=Migracija kategorij
-MigrationEvents=Migracija dogodkov za dodajanje lastnika dogodka v dodelitveno tabelo
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Ponovno naložite modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Prikaži opcije, ki niso na voljo
-HideNotAvailableOptions=Skrij opcije, ki niso na voljo
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index cc17ea4654f..9fbf0693951 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakti tega partnerja
 ContactsAddressesForCompany=Kontakti/naslovi za tega partnerja
 AddressesForCompany=Naslovi za tega partnerja
 ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Dogodki okoli tega člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s zamujenih
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Stroškovna poročila
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 8c568fd362c..c5549ded0a1 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Povezani objekti
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Naziv
 WEBSITE_DESCRIPTION=Opis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/sl_SI/paybox.lang b/htdocs/langs/sl_SI/paybox.lang
index f25bc8b1774..01584d70a69 100644
--- a/htdocs/langs/sl_SI/paybox.lang
+++ b/htdocs/langs/sl_SI/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Nastavitev modula za online plačila Paybox
 PayBoxDesc=Ta modul omogoča kupcem plačevanje na <a href="http://www.paybox.com" target="_blank">Paybox</a>. Lahko se uporabi za prosto plačevanje ali za plačilo posameznih Dolibarr postavk (račun, naročilo, ...)
 FollowingUrlAreAvailableToMakePayments=Naslednji URL naslovi so na voljo kupcem za izvedbo plačil Dolibarr postavk
 PaymentForm=Obrazec za plačilo
-WelcomeOnPaymentPage=Dobrodošli v naši storitvi online plačil
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ta zaslon omogoča online plačilo za %s.
 ThisIsInformationOnPayment=To je informacija o potrebnem plačilu
 ToComplete=Za dokončanje
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL naslov s ponudbo %s vmesnika za online
 ToOfferALinkForOnlinePaymentOnContractLine=URL naslov s ponudbo %s vmesnika za online plačila po pogodbi
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL naslov s ponudbo %s vmesnika za online plačila poljubnih zneskov
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL naslov s ponudbo %s vmesnika za online plačila članarin
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Vsakemu od teh URL naslovov lahko tudi dodate url parameter <b>&tag=<i>vrednost</i></b> (zahtevano samo pri poljubnih plačilih) s komentarjem vašega plačila.
-SetupPayBoxToHavePaymentCreatedAutomatically=Nastavite vaš PayBox z url <b>%s</b> za avtomatsko kreiranje plačil po potrditvi.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ta stran potrjuje, da je bilo vaše plačilo sprejeto. Hvala.
-YourPaymentHasNotBeenRecorded=Vaše plačilo ni bilo sprejeto in prenos je bil preklican. Hvala.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametri računa
 UsageParameter=Parametri uporabe
 InformationToFindParameters=Pomoč pri iskanju informacij računa %s
diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
index af4b0925277..09f72c442ad 100644
--- a/htdocs/langs/sl_SI/propal.lang
+++ b/htdocs/langs/sl_SI/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Podpisana (potrebno fakturirati)
 PropalStatusNotSigned=Nepodpisana (zaprta)
 PropalStatusBilled=Fakturirana
 PropalStatusDraftShort=Osnutek
-PropalStatusValidatedShort=Potrjen
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zaprta
 PropalStatusSignedShort=Podpisana
 PropalStatusNotSignedShort=Nepodpisana
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Ponudbe %s ne najdem
 AddToDraftProposals=Dodaj osnutku ponudbe
 NoDraftProposals=Ni osnutkov ponudbe
 CopyPropalFrom=Kreiraj komercialno ponudbo s kopiranjem obstoječe ponudbe
-CreateEmptyPropal=Kreiraj prazno komercialno ponudbo ali izberi s seznama prizvodov/storitev
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Privzeto trajanje veljavnosti komercialne ponudbe (v dneh)
-UseCustomerContactAsPropalRecipientIfExist=Kot naslov prejemnika ponudbe uporabi naslov kontakta pri kupcu, če je na voljo, namesto naslova partnerja
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Kloniraj komercialno ponudbo
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kontakt pri kupcu za sledenje ponudbe
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Vzorec kompletne ponudbe (logo...)
+DocModelCyanDescription=Vzorec kompletne ponudbe (logo...)
 DefaultModelPropalCreate=Ustvarjanje privzetega modela
 DefaultModelPropalToBill=Privzeta predloga za zaključek ponudbe (za fakturiranje)
 DefaultModelPropalClosed=Privzeta predloga za zaključek ponudbe (nefakturirana)
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 3a2df365141..5e075fd4343 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Koda
-WebsiteSetupDesc=Vnesite toliko zapisov, kot želite imeti spletnih strani.  Za urejanje pojdite na Menu => Websites.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Izbriši spletno stran
-ConfirmDeleteWebsite=Ali ste prepričani, da želite izbrisati to spletno starn. Vse strani in vsebina bodo pobrisani.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Preberite
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 224091ca45b..4df5eb5f6f5 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Editimi i menuve
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Faturat
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Furnitorët
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index db32ee99d62..013dc28dd00 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -7,7 +7,7 @@ BankName=Emri i Bankës
 FinancialAccount=Llogari
 BankAccount=Llogari bankare
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 01ca0003373..77a27f75552 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Mbyllur
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Tjetër
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Lista e faturave të papaguara
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index b3e9f59cc14..0081f0d3cc5 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
index e1f9968bd40..165c13db1ad 100644
--- a/htdocs/langs/sq_AL/commercial.lang
+++ b/htdocs/langs/sq_AL/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonatё
 ActionAC_FAX=Dёrgo faks
 ActionAC_PROP=Dёrgo propozimin me email
 ActionAC_EMAIL=Dёrgo email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Takimet
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Dёrgo faturёrn klientit me email
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=Pa limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sq_AL/dict.lang b/htdocs/langs/sq_AL/dict.lang
index a9752d40757..0714eef513e 100644
--- a/htdocs/langs/sq_AL/dict.lang
+++ b/htdocs/langs/sq_AL/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Indi
 CountryID=Indonezi
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Korea e Veriut
 CountryKR=Korea e Jugut
 CountryKW=Kuvait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Liban
@@ -160,7 +160,7 @@ CountryMD=Moldavi
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambik
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turqi
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrainë
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Punonjës
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index e5c26493a46..f5bb7b620a3 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sq_AL/help.lang b/htdocs/langs/sq_AL/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/sq_AL/help.lang
+++ b/htdocs/langs/sq_AL/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index be527631e06..11916fff46f 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Lejet
-CPTitreMenu=Lejet
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Miratuar
 CancelCP=Anulluar
 RefuseCP=Refuzuar
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Përshkrimi
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Kërkesë për leje
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Fshi
 ActionRefuseCP=Refuzo
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index 51a88b09e7c..35fe8a0acfc 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Dёshtim nё krijimin e bazёs sё tё dhёnave '%s'
 ErrorFailedToConnectToDatabase=Dёshtim pёr tu lidhur me bazёn e tё dhёnave '%s'
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Versioni i PHP
 License=Using license
 ConfigurationFile=Skedari i konfigurimit
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Serveri
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 9086d38afd4..9ec8bc8178d 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index b4cf6248d99..4e628e0a3b3 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Përshkrimi
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang
index 5c293add9e9..44aa1c17238 100644
--- a/htdocs/langs/sq_AL/paybox.lang
+++ b/htdocs/langs/sq_AL/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Mёnyra e pagesёs
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=Pёr tu plotёsuar
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametrat e llogarisё
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index 0b64b1387c0..0267a27c950 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Mbyllur
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 0f0673e3716..6ae08738815 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 2286b838d91..da2954bd5f0 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sajtovi i druge front aplikacije
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfejsi sa eksternim sistemima
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Korisnici & Grupe
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 845f59755f5..7a5b65a2bec 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -7,7 +7,7 @@ BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Račun u banci
 BankAccounts=Računi u banci
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Prikaži račun
 AccountRef=Finansijski račun referenca
 AccountLabel=Oznaka finansijskog računa
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Adresa računa
 BankAccountCountry=Država računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Provera integriteta vrednosti nije uspela. To znači da informacije za ovaj broj računa ili su nepotpune ili pogrešna (proverite državu, brojeve i IBAN)
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Nov finansijski račun
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Ne može se poravnati
 Conciliate=Poravnati
 Conciliation=Poravnanje
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Uključi zatvorene račune
 OnlyOpenedAccount=Samo otvoreni računi
@@ -104,7 +105,7 @@ SocialContributionPayment=Uplate poreza/doprinosa
 BankTransfer=Bankovni prenos
 BankTransfers=Bankovni prenosi
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prenos od  <b>%s</b> to <b>%s</b> of <b>%s</b> %s je zabeležen.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni ček
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Prikaži unovčen ček
-NumberOfCheques=Br. čeka
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Prikaži za sve račune
-FutureTransaction=Transakcije u budućnosti. Ne postoji način za izmirenje.
-SelectChequeTransactionAndGenerate=Obeleži/filtriraj čekove da ih uključite u unovčene čekove i kliknite na "Kreiraj"
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Odaberi izvod iz banke povezan sa poravnanjem. Upotrebi sledeću numeričku vrednost: YYYYMM or YYYYMMDD
 EventualyAddCategory=Na kraju, definišite kategoriju u koju želite da klasifikujete izveštaje
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Datum vraćanja čeka
 CheckRejected=Vraćen ček
 CheckRejectedAndInvoicesReopened=Ček vraćen i faktura ponovo otvorena
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 01386cf5d3e..585e371968f 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Predračun
 InvoiceProFormaDesc=<b>Predračun</b> je neobavezujući dokument koji ima sve karakteristike računa.
 InvoiceReplacement=Zamenski račun
 InvoiceReplacementAsk=Zamenski račun za račun
-InvoiceReplacementDesc=<b>Zamenski račun</b>se koristi da bi se otkazao i potpuno zamenio račun za koji do sada nije primljena uplata.<br><br>Napomena: Samo računi bez registrovane uplate mogu biti zamenjeni. Ukoliko račun koji menjate još uvek nije zaključen, biće automatski zaključen sa statusom "napušten"
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Knjižno odobrenje (kredit nota)
 InvoiceAvoirAsk=Knjižno odobrenje za korekciju računa
-InvoiceAvoirDesc=<b>Kredit nota</b> je negativni račun koji se koristi za korekciju računa na kome je iznos koji se razlikuje od iznosa koji je već plaćen (zato što je kupac greškom uplatio više, ili neće platiti puni iznos računa, jer je vratio neke proizvode, npr).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Refundirano
 DeletePayment=Obriši plaćanje
 ConfirmDeletePayment=Da li ste sigurni da želite da obrišete ovu uplatu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Plaćanja dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Uplate primljene od kupaca
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Primljene uplate kupaca za validaciju
 PaymentsReportsForYear=Izveštaj od plaćanjima za %s
 PaymentsReports=Izveštaj o plaćanjima
@@ -91,8 +91,8 @@ PaymentConditionsShort=Uslovi plaćanja
 PaymentAmount=Iznos za plaćanje
 ValidatePayment=Potvrdi plaćanje
 PaymentHigherThanReminderToPay=Iznos koji želite da platiteje viši od iznosa za plaćanje
-HelpPaymentHigherThanReminderToPay=Pažnja, iznos za plaćanje na jednom ili više računa je viši od preostalog iznosa za plaćanje. <br> Izmenite svoj unos, ili potvrdite i razmislite o kreiranju knjižnog odobrenja za svaki više uplaćen račun.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikuj kao "plaćeno"
 ClassifyPaidPartially=Klasifikuj "delimično plaćeno"
 ClassifyCanceled=Klasifikuj "napušteno"
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Zatvoreno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (delimično)
 BillShortStatusDraft=Nacrt
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refundirano ili konvertovano
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Napušteno
 BillShortStatusValidated=Potvrdjeno
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Nije refundirano
 BillShortStatusClosedUnpaid=Zatvoreno
 BillShortStatusClosedPaidPartially=Plaćeno (delimično)
 PaymentStatusToValidShort=Za potvrdu
-ErrorVATIntraNotConfigured=PIB broj nije definisan
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Nije definisan obrazac za plaćanje. Izvršite podešavanje modula "Računi" kako biste ovo ispravili
 ErrorCreateBankAccount=Kreiraj bankovni račun, a potom idi u panel za podešavanje modula "Računi" da biste definisali načine plaćanja
 ErrorBillNotFound=Račun %s ne postoji
-ErrorInvoiceAlreadyReplaced=Greška! Pokušavate da potvrdite račun koji treba da zameni račun %s. Ali, ovaj račun je već zamenjen računom %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Greška! Popust je već iskorišćen
 ErrorInvoiceAvoirMustBeNegative=Greška! Račun korekcije mora imati negativan iznos
 ErrorInvoiceOfThisTypeMustBePositive=Greška! Ovaj tip računa mora imati pozitivan iznos
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne možete otkazati račun koji je zamenjen drugim računom, koji je još uvek u status nacrta.
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Akcije nad računom
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Da li ste sigurni da želite da promeni status računa <
 ConfirmCancelBill=Da li ste sigurni da želite da otkažete račun <b>%s</b>?
 ConfirmCancelBillQuestion=Zašto želite da klasifikujete ovaj račun kao  'napušten'?
 ConfirmClassifyPaidPartially=Da li ste sigurni da želite da promeni status računa <b>%s</b> u status plaćen?
-ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u celosti. Iz kojih razloga želite da zatvorite ovaj račun?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Da li ste sigurni da želite da potvrdite ovu uplatu? Kada je uplata potvrdjena, promene nisu moguće.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Da li ste sigurni da želite da napravite kopiju ovog računa <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Da li ste sigurni da želite da uklonite ovaj popust?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=ID depozita
 NbCheque=Broj čekova
 CreditNoteConvertedIntoDiscount=Ovo %s je konvertovano u %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index f26d33c3074..d8bee365cfe 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Prikaži firmu
 ShowStock=Prikaži magacin
 DeleteArticle=Kliknite da uklonite ovaj atikal
 FilterRefOrLabelOrBC=Pretraži (Ref/Oznaku)
-UserNeedPermissionToEditStockToUsePos=Zatražili ste da smanjite zalihe na kreiranoj fakturi, tako da korisnik koji koristi POS mora da zatraži dozvolu da izmeni zalihe.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr štampač računa
+PointOfSale=Maloprodaje
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/sr_RS/commercial.lang b/htdocs/langs/sr_RS/commercial.lang
index f50463d51e1..bc9f2438583 100644
--- a/htdocs/langs/sr_RS/commercial.lang
+++ b/htdocs/langs/sr_RS/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonski poziv
 ActionAC_FAX=Posalji faksom
 ActionAC_PROP=Pošalji ponudu mejlom
 ActionAC_EMAIL=Pošalji mejl
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Sastanci
 ActionAC_INT=Intervencija na lokaciji
 ActionAC_FAC=Pošalji fakturu klijentu na mejl
@@ -72,8 +73,8 @@ StatusProsp=Status prospekta
 DraftPropals=Nacrt komercijalne ponude
 NoLimit=Bez limita
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sr_RS/dict.lang b/htdocs/langs/sr_RS/dict.lang
index b38d2727d9c..da707274aaa 100644
--- a/htdocs/langs/sr_RS/dict.lang
+++ b/htdocs/langs/sr_RS/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldavija
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turska
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dolari
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Od ova do uva
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Zaposleni
 DemandReasonTypeSRC_SPONSORING=Sponzorstvo
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/sr_RS/ecm.lang b/htdocs/langs/sr_RS/ecm.lang
index 86091a7c03d..35750af87f0 100644
--- a/htdocs/langs/sr_RS/ecm.lang
+++ b/htdocs/langs/sr_RS/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Br dokumentata u folderu
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Folder
 ECMSectionManual=Ručni folder
 ECMSectionAuto=Automatski folder
@@ -34,6 +34,8 @@ ECMDocsByProjects=Dokumenti vezani za projekte
 ECMDocsByUsers=Dokumenti vezani za korisnike
 ECMDocsByInterventions=Dokumenti vezani za intervencije
 ECMDocsByExpenseReports=Dokumenta povezana za izveštajem o troškovima
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Folder nije kreiran
 ShowECMSection=Pokaži folder
 DeleteSection=Obriši folder
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 6cd41acbd9d..a7e80297a5a 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=Greška u SOAP klijentu "%s"
 ErrorGlobalVariableUpdater5=Nema selektovane globalne promenljive
 ErrorFieldMustBeANumeric=Polje <b>%s</b> mora biti numeričko
 ErrorMandatoryParametersNotProvided=Obavezni parametar(i) nije dat
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Pogrešna definicija Menu Array u Module Descriptoru (pogrešna vrednost za fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
 WarningMandatorySetupNotComplete=Obavezna podešavanja još nisu obavljena.
diff --git a/htdocs/langs/sr_RS/help.lang b/htdocs/langs/sr_RS/help.lang
index 43b8cc1f621..16b41f8b704 100644
--- a/htdocs/langs/sr_RS/help.lang
+++ b/htdocs/langs/sr_RS/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote podrška
 OtherSupport=Druga podrška
 ToSeeListOfAvailableRessources=Da biste kontaktirali/videli raspoložive resurse:
 HelpCenter=Help centar
-DolibarrHelpCenter=Dolibarr help centar i podrška
-ToGoBackToDolibarr=U suprotnom, kliknite <a href="%s">ovde da otvorite Dolibarr</a>
-TypeOfSupport=Izvor podrške
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (besplatno)
 TypeSupportCommercial=Komercijalna
 TypeOfHelp=Tip
@@ -15,12 +15,9 @@ NeedHelpCenter=Potrebna vam je pomoć ili podrška?
 Efficiency=Efikasnost
 TypeHelpOnly=Samo pomoć
 TypeHelpDev=Pomoć+Razvoj
-TypeHelpDevForm=Pomoć+Razvoj+Obuka
-ToGetHelpGoOnSparkAngels1=Neke kompanije mogu pružiti bržu (nekada i trenutnu) i efikasniju online podršku ukoliko preuzmu kontrolu nad Vašim računarom. Ovakva podrška je dostupna na <b>%s</b> web sajtu:
-ToGetHelpGoOnSparkAngels3=Takođe možete konsultovati listu dostupnih Dolibarr eksperata - za to kliknite na dugme
-ToGetHelpGoOnSparkAngels2=Ponekad nema dostupnih kompanija u trenutku kada vršite pretragu. Zato nemojte zaboraviti da promenite filter da biste potražili "sve dostupnosti". Bićete u mogućnosti da pošaljete više zahteva.
-BackToHelpCenter=U suprotnom, kliknite ovde da otvorite <a href="%s">naslovnu stranu help centra</a>.
-LinkToGoldMember=Možete pozvati jednog od preselektovanih eksperata za Dolibarr na Vašem jeziku (%s) tako što ćete kliknuti njegov Widget (status i maksimalna cena su automatski ažurirani):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Podržani jezici
-SubscribeToFoundation=Pomozite Dolibarr projektu, učlanite se u fondaciju
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Za zvaničnu Dolibarr podršku na Vašem jeziku: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index 5f1a64c53d9..5fd903c0361 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Odsustva
-CPTitreMenu=Odsustva
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Mesečna promena
 MenuAddCP=Novi zahtev za odsustvo
-NotActiveModCP=Morate aktivirati modul Odsustva da biste videli ovu stranu.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Zatraži odsustvo
 DateDebCP=Početak
 DateFinCP=Kraj
@@ -15,13 +15,18 @@ ApprovedCP=Odobren
 CancelCP=Otkazan
 RefuseCP=Odbijen
 ValidatorCP=Odobrava
-ListeCP=Lista odsustva
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Kreiraj zahtev za odsustvo
 DelayToRequestCP=Zahtevi za odsustvo moraju biti kreirani makar <b>%s dan(a)</b> pre odsustva.
-MenuConfCP=Balans odsustva
-SoldeCPUser=Broj slobodnih dana je <b>%s</b>.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Morate selektovati kraj posle početka.
 ErrorSQLCreateCP=Došlo je do SQL greške prilikom kreacije:
 ErrorIDFicheCP=Došlo je do greške, zahtev za odsustvo ne postoji.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Nemate prava da vidite ovaj zahtev za odsustvo.
 InfosWorkflowCP=Tok informacija
 RequestByCP=Zatražio
 TitreRequestCP=Zahtev za odsustvo
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Broj potrošenih dana od odmora
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Izmeni
 DeleteCP=Obriši
 ActionRefuseCP=Odbij
@@ -59,6 +71,7 @@ DateRefusCP=Datum odbijanja
 DateCancelCP=Datum otkazivanja
 DefineEventUserCP=Dodeli vanredno odsustvo za korisnika
 addEventToUserCP=Dodeli odsustvo
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Razlog
 UserCP=Korisnik
 ErrorAddEventToUserCP=Greška prilikom kreiranja vanrednog odsustva.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Uspešno ažurirano
 Module27130Name= Upravljanje zahtevima za odsustvo
 Module27130Desc= Upravljanje zahtevima za odsustvo
@@ -94,7 +112,7 @@ NoticePeriod=Rok za obaveštenje
 HolidaysToValidate=Odobri zahteve za odsustva
 HolidaysToValidateBody=Ispod je zahtev za odobrenje
 HolidaysToValidateDelay=Ovaj zahtev se odnosi na period manji od %s dana
-HolidaysToValidateAlertSolde=Korisnik koji je napravio zahtev nema dovoljno slobodnih dana.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Odobreni zahtevi za odsustva
 HolidaysValidatedBody=Vaš zahtev za odsustvo %s do %s je potvrđen.
 HolidaysRefused=Zahtev odbijen
@@ -103,4 +121,9 @@ HolidaysCanceled=Otkazan zahtev za odsustvo
 HolidaysCanceledBody=Vaš zahtev za odsustvo %s do %s je otkazan.
 FollowedByACounter=1: Ovaj tip odsustva treba da se prati brojačem. Brojač se povećava ručno ili automatski i kada je odsustvo potvrđeno, brojač se smanjuje. <br> 0: Ne prati se brojačem.
 NoLeaveWithCounterDefined=Ne postoje definisana odsustva koja treba da se prate brojačem
-GoIntoDictionaryHolidayTypes=Idite na <strong>Home - Podešavanja - Rečnik - Tip odsustva</strong> da biste podesili različite tipove odsustva.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index 416bb2b3aa2..98838349541 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Samo pratite instrukcije korak po korak.
 MiscellaneousChecks=Provera konfiguracije
 ConfFileExists=Konfiguracioni fajl <b>%s</b> postoji.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracioni fajl <b>%s</b> ne postoji i ne može biti kreiran !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfiguracioni fajl <b>%s</b> može biti kreiran.
-ConfFileIsNotWritable=Nemoguće izmeniti konfiguracioni fajl <b>%s</b>. Proverite prava. Za prvu instalaciju, Vaš web server mora imati mogućnost da izmeni ovaj fajl prilikom konfiguracije ("chmod 666" na primer na *NIX sistemu).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfiguracioni fajl <b>%s</b> može biti izmenjen.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Učitaj sve informacije iz konfiguracionog fajla.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP podržava sesije.
 PHPSupportPOSTGETOk=PHP podržava POST i GET promenljive
-PHPSupportPOSTGETKo=Moguće je da Vaš PHP ne podržava POST i/ili GET promenljive. Proverite parametar <b>variables_order</b> u php.ini.
-PHPSupportGD=PHP podržava GD grafičke funkcije.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=PHP podržava UTF8 funkcije.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Maksimalna memorija za sesije je <b>%s</b>. To bi trebalo biti dovoljno.
-PHPMemoryTooLow=Maksimalna memorija za sesije je <b>%s</b> bytes. Ovo ne bi trebalo da je dovoljno. Promenite <b>php.ini</b> i podesite <b>memory_limit</b> na najmanje <b>%s</b> bytes.
-Recheck=Kliknite ovde za detaljniji test
-ErrorPHPDoesNotSupportSessions=Vaš PHP ne podržava sesije. Ova funkcionalnost je neophodna za Dolibarr. Proverite PHP podešavanja.
-ErrorPHPDoesNotSupportGD=Vaša PHP instalacija ne podržava grafičke funkcije GD. Grafici neće biti dostupni.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Vaša PHP instalacija ne podržava UTF8 funkcije. Dolibarr ne može da funkcioniše kako treba. Ispravite ovo pre instalacije Dolibarr-a.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Folder %s ne postoji.
-ErrorGoBackAndCorrectParameters=Vratite se nazad i ispravite pogrešne parametre.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Verovatno ste uneli pogrešnu vrednost za parametar "%s"
 ErrorFailedToCreateDatabase=Greška prilikom kreacije baze podataka "%s".
 ErrorFailedToConnectToDatabase=Greška prilikom povezivanja na bazu podataka "%s".
 ErrorDatabaseVersionTooLow=Verzija baze (%s) je previš stara. Neophodna je verzija %s ili novija.
 ErrorPHPVersionTooLow=Verzija PHP instalacije je previše stara. Neophodna je verzija %s.
-ErrorConnectedButDatabaseNotFound=Konekcija na server je uspešna, ali baza "%s" nije pronađena.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Baza "%s" već postoji.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ukoliko baza ne postoji, vratite se nazad i selektirajte opciju "Kreiranje baze".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ukoliko baza već postoji, vratite se nazad i od-selektirajte opciju "Kreiranje baze".
-WarningBrowserTooOld=Vaš browser nije podržan. Preporučujemo da instalirate novu verziju Firefox, Chrome ili Opera browsera.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP verzija
 License=Korišćenje licence
 ConfigurationFile=Konfiguracioni fajl
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr baza
 DatabaseType=Tip baze
 DriverType=Tip drajvera
 Server=Server
-ServerAddressDescription=Ime ili IP adresa servera baze, obično "localhost" kada je baza na istom serveru kao i web server.
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Port baze. Ostavite prazno ako nije poznat.
 DatabaseServer=Server baze
 DatabaseName=Ime baze
-DatabasePrefix=Prefiks za tabele u bazi
-AdminLogin=Login za vlasnika Dolibarr baze.
-PasswordAgain=Ponovo unesite password
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password za vlasnika Dolibarr baze.
 CreateDatabase=Kreiraj bazu
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Server baze - superuser access
-CheckToCreateDatabase=Selektirajte ovu opciju ukoliko baza ne postoji i mora biti kreirana.<br> U ovom slučaju, morate ispuniti login/lozinku superuser-a na dnu ove strane.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Prijava korisnika dozvoljena da kreira novu bazu ili korisnike, obavezno ako Vaša baza nema svog vlasnika ili ne postoji.
-KeepEmptyIfNoPassword=Ostavite prazno ako user nema password (izbegavajte ovo)
-SaveConfigurationFile=Sačuvaj vrednosti
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Konekcija na server
 DatabaseCreation=Kreacija baze
 CreateDatabaseObjects=Kreacija objekata baze
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Kreacije foreign key i indexa za tabelu %s
 OtherKeysCreation=Kreacija foreign key i indexa
 FunctionsCreation=Kreacija funkcija
 AdminAccountCreation=Kreacija Administrator login-a
-PleaseTypePassword=Molimo unesite password, prazni passwordi nisu dozvoljeni !
-PleaseTypeALogin=Molimo ukucajte login !
-PasswordsMismatch=Lozinke su različite, pokušajte ponovo !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Kraj setup-a
 SystemIsInstalled=Instalacija je završena.
 SystemIsUpgraded=Dolibarr je uspešno upgrade-ovan.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Treba da konfigurišete Dolibarr kako bi ste ga prilag
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Otvorite Dolibarr
 GoToSetupArea=Otvorite Dolibarr (podešavanja)
-MigrationNotFinished=Verzija Vaše baze nije sasvim ažurna, moraćete da ponovite upgrade proceduru.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Otvorite upgrade stranu ponovo
 WithNoSlashAtTheEnd=Bez slash-a "/" na kraju
-DirectoryRecommendation=Preporučeno je da koristite folder van Vašeg foldera za web strane.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists= Već postoji
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administratorski nalog '<b>%s</b>' postoji. Idite nazad ako želite da kreirate drugi.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Upozorenje, iz bezbednosnih razloga, kada završite instalaciju ili nadogradnju, kako bi ste izbegli ponovno korišćenje instalacionih alata, dodajte fajl <b>install.lock</b> u Dolibarr document direktorijum, radi sprečavanja zloupotrebe.
-FunctionNotAvailableInThisPHP=Nije dostupno na ovoj verziji PHP-a
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Izaberite skriptu za migraciju
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Procesuiranje skripte
 ChooseYourSetupMode=Izaberite mod setup-a i kliknite na "Start"...
 FreshInstall=Nova instalacija
-FreshInstallDesc=Koristite ovaj režim ako je ovo prva instalacija. Ako ne, ovaj režim može popraviti nekompletnu prethodnu instalaciju, ali ako želite da nadogradite vašu verziju, koristite režim "Nadogradnja".
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Koristite ovaj režim da zamenite stare Dolibarr fajlove sa novim fajlovima. Ovo će nadograditi vašu bazu i podatke.
 Start=Start
 InstallNotAllowed=Setup nije dozvoljen sa ovim pravima <b>conf.php</b>
 YouMustCreateWithPermission=Morate kreirati fajl %s i postaviti dozvole upisa tokom instalacionog procesa na web serveru.
-CorrectProblemAndReloadPage=Molimo ispravite ovaj problem i pritisnite F5 da ponovo učitate stranu.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Već migrirano
 DatabaseVersion=Verzija baze
 ServerVersion=Verzija servera baze
 YouMustCreateItAndAllowServerToWrite=Morate da kreirate ovaj folder i da dozvolite web serveru da piše u njemu.
 DBSortingCollation=Sortiranje karaktera
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Hteli ste da kreirate bazu <b>%s</b>, ali za ovo, Dolibarr mora da se konektuje na server <b>%s</b> sa dozvolama super korisnika <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Hteli ste da kreirate prijavu na bazu <b>%s</b>, ali za ovo, Dolibarr mora da se konektuje na server <b>%s</b> sa dozvolama super korisnika <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=Kako je konekcija neuspešna, podaci hosta ili super korisnika su pograšno uneti.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Otkrivene zaostale uplate metodom %s
 RemoveItManuallyAndPressF5ToContinue=Uklonite ručno i stisnite F5 za nastavak.
 FieldRenamed=Polje je preimenovano
-IfLoginDoesNotExistsCheckCreateUser=Ako login još ne postoji, morate selektirati opciju "Kreacija korisnika"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migracija je završena
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktiviraj modul %s
 ShowEditTechnicalParameters=Kliknite ovde da prikažete/editujete napredne parametre (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=Koristite Dolibarr čarobnjaka za instalaciju iz DoliWamp-a, tako da su zahtevane vrednosti već optimizovane. Menjajte ih samo ako znate šta radite.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migracija podataka komercijalnih ponuda
 MigrationInvoice=Migracija podataka računa klijenata
 MigrationContract=Migracija podataka ugovora
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade uspešno završen
 MigrationUpdateFailed=Greška prilikom upgrade-ovanja
 MigrationRelationshipTables=Migracija podataka veznih tabela (%s)
 MigrationPaymentsUpdate=Ispravke podataka o plaćanju
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Ispravka podataka ugovora
 MigrationContractsNumberToUpdate=%s ugovor(a) za ažuriranje
 MigrationContractsLineCreation=Kreiraj liniju ugovora za ref ugovora %s
 MigrationContractsNothingToUpdate=Nema preostalih akcija.
-MigrationContractsFieldDontExist=Polje fk_facture više ne postoji.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Ispravka praznih datuma u ugovorima
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Nema praznih datuma u ugovorima za ispravku
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nema datuma kreacije ugovora za ispravku
 MigrationContractsInvalidDatesUpdate=Pogrešna vrednost za ispravku datuma u ugovoru
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Ažuriranje isporuka
 MigrationStockDetail=Ažuriranje vrednosti zalihe proizvoda
 MigrationMenusDetail=Ažuriranje dinamičkih menija
 MigrationDeliveryAddress=Ažuriranje adresa isporuke
-MigrationProjectTaskActors=Migracija podataka za lx_projet_task_actors tabelu
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Migracija podataka polja fk_user_resp iz llx_projet u llx_element_contact
 MigrationProjectTaskTime=Vreme ažuriranja u sekundama
 MigrationActioncommElement=Ažuriranje podataka akcija
 MigrationPaymentMode=Migracija podataka načina plaćanja
 MigrationCategorieAssociation=Migracija kategorija
-MigrationEvents=Migracija događaja i dodavanje vlasnika događaja u assignment tabelu
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Ponovo učitavanje modula %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Prikaži nedostupne opcije
-HideNotAvailableOptions=Sakrij nedostupne opcije
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index b7ec39628fb..cc3aa5ed8b4 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakti za ovaj subjekat
 ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekat
 AddressesForCompany=Adrese za ovaj subjekat
 ActionsOnCompany=Događaji vezani za ovaj subjekat
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Događaji vezani za ovog člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s kasni
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Trošak
 ExpenseReports=Troškovi
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 994cdcf91f7..417f29264f4 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Povezan objekat
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Podešavanja modula sajta
 WEBSITE_PAGEURL=URL stranice
 WEBSITE_TITLE=Naslov
 WEBSITE_DESCRIPTION=Opis
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Ključne reči
 LinesToImport=Lines to import
diff --git a/htdocs/langs/sr_RS/paybox.lang b/htdocs/langs/sr_RS/paybox.lang
index cf7cacb50fc..f4962ccc049 100644
--- a/htdocs/langs/sr_RS/paybox.lang
+++ b/htdocs/langs/sr_RS/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=Podešavanja modula PayBox
 PayBoxDesc=Ovaj modul nudi strane za uplatu na <a href="http://www.paybox.com" target="_blank">Paybox-u</a>. Može biti korišćen za slobodne uplate, ili za uplate vezane za određeni Dolibarr objekat (faktura, narudžbenica, ...)
 FollowingUrlAreAvailableToMakePayments=Sledeći URL-ovi mogu omogućiti klijentu da izvrši uplatu na Dolibarr objekte
 PaymentForm=Forma za uplatu
-WelcomeOnPaymentPage=Dobrodošli na naš servis online plaćanja
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Ovaj ekran vam omogućava da izvršite online uplatu u korist %s
 ThisIsInformationOnPayment=Ovo su informacije o uplati
 ToComplete=Popuniti
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL za korisnički interfejs %s online upl
 ToOfferALinkForOnlinePaymentOnContractLine=URL za korisnički interfejs %s online uplate za liniju ugovora
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL za korisnički interfejs %s online uplate za slobodan iznos
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL za korisnički interfejs %s online uplate za korisničku pretplatu
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Takođe možete dodati url parametar <b>&tag=<i>value</i></b> na bilo koji od ovih URL-ova (samo za slobodne uplate) kako biste uneli svoj sopstveni komentar za uplatu.
-SetupPayBoxToHavePaymentCreatedAutomatically=Podesite svoj PayBox sa url-om <b>%s</b> kako bi se uplata kreirala automatski kada je potvrđena u paybox-u.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Ova strana potvrđuje da je Vaša uplata registrovana. Hvala.
-YourPaymentHasNotBeenRecorded=Vaša uplata nije registrovana i transakcija je otkazana. Hvala.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Parametri naloga
 UsageParameter=Parametri korišćenja
 InformationToFindParameters=Pomoć za pronalaženje informacije o Vašem %s nalogu
diff --git a/htdocs/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
index 8dc240a3803..74f4809e566 100644
--- a/htdocs/langs/sr_RS/propal.lang
+++ b/htdocs/langs/sr_RS/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Potpisana (za naplatu)
 PropalStatusNotSigned=Nepotpisana (zatvorena)
 PropalStatusBilled=Naplaćena
 PropalStatusDraftShort=Nacrt
-PropalStatusValidatedShort=Potvrđen
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Zatvorena
 PropalStatusSignedShort=Potpisana
 PropalStatusNotSignedShort=Nepotpisana
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Ponuda %s nije pronađena
 AddToDraftProposals=Ubaci u draft ponude
 NoDraftProposals=Nema draft ponuda
 CopyPropalFrom=Dupliraj postojeću ponudu
-CreateEmptyPropal=Napravi praznu ponudu ili novu ponudu iz liste proizvoda/usluga
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default trajanje validnosti komercijalne ponude (u danima)
-UseCustomerContactAsPropalRecipientIfExist=Koristi adresu kontakta (ukoliko postoji) umesto adrese subjekta za adresu na komercijalnoj ponudi
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Dupliraj komercijalnu ponudu
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kontakt klijenta koji prati ponudu
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Kompletan model ponude (logo...)
+DocModelCyanDescription=Kompletan model ponude (logo...)
 DefaultModelPropalCreate=Kreacija default modela
 DefaultModelPropalToBill=Default model prilikom zatvaranja komercijalne ponude (za naplatu)
 DefaultModelPropalClosed=Default model prilikom zatvaranja komercijalne ponude (nenaplaćen)
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index cd54c6e65ff..3dbd97b6229 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Funktion avstängd i demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-moduler verktyg
 ModuleFamilyExperimental=Experimentell moduler
 ModuleFamilyFinancial=Finansiella Moduler (Redovisning / Treasury)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Meny hanterar
 MenuAdmin=Menu Editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Användare & grupper
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Företag och kontakt ledning
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Kommersiella
 Module2Desc=Kommersiell förvaltning
 Module10Name=Bokföring
@@ -501,7 +501,7 @@ Module23Desc=Övervakning av förbrukningen av energi
 Module25Name=Kundorder
 Module25Desc=Kundorder ledning
 Module30Name=Fakturor
-Module30Desc=Fakturor och kreditnota: s förvaltning för kunder. Faktura ledning för leverantörer
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Leverantörer
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Moms Priser och Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Betalningsvillkor
 DictionaryPaymentModes=Betalningssätten
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Miljöskatt (WEEE)
 DictionaryPaperFormat=Pappersformat
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Lokala skatter rapporter är summan av localtaxes försäljnin
 LabelUsedByDefault=Etikett som används som standard om ingen översättning kan hittas för kod
 LabelOnDocuments=Etikett på dokument
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=I slutet av månaden
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Säkerhetsgranskning evenemang
-Audit=Revision
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser namn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Förteckning över Dolibarr säkerhetshändelser
 SecurityEventsPurged=Säkerhetshändelser renas
-LogEventDesc=Du kan aktivera här loggning för Dolibarr säkerhet händelser. Administratörer kan sedan se dess innehåll via menyn <b>Systemverktyg - Revision.</b> Varning, kan denna funktion konsumerar en stor mängd data i databasen.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Detta område är tillgänglig för administratören användare. Ingen av de Dolibarr behörigheter kan minska denna gräns.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Steg avrundningsintervall (för länder där avrundning g
 UnitPriceOfProduct=Net priset per enhet för en produkt
 TotalPriceAfterRounding=Total kostnad (netto / behållare / inkl moms) efter avrundning
 ParameterActiveForNextInputOnly=Parameter effektiv för nästa inmatning
-NoEventOrNoAuditSetup=Ingen säkerhet händelsen har registrerats ännu. Detta kan vara normalt om revisionen inte har aktiverats på &quot;setup - säkerhet - revision&quot; sidan.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Se din lokala sendmail setup
 BackupDesc=För att göra en fullständig säkerhetskopia av Dolibarr måste du:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Kompletterande attribut (orderrader)
 ExtraFieldsSupplierInvoicesLines=Kompletterande attribut (faktura linjer)
 ExtraFieldsThirdParties=Kompletterande attribut (tredjeparts)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Kompletterande attribut (medlem)
 ExtraFieldsMemberType=Kompletterande attribut (ledamot typ)
 ExtraFieldsCustomerInvoices=Kompletterande attribut (fakturor)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Lista över fasta anmälningar
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Tröskelvärde
 BackupDumpWizard=Guiden för att bygga databas backup dumpfilen
 SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index ca8b861bdf4..6caf97504d9 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -7,7 +7,7 @@ BankName=Bankens namn
 FinancialAccount=Konto
 BankAccount=Bankkonto
 BankAccounts=Bankkonton
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Visa konto
 AccountRef=Finansiell balans ref
 AccountLabel=Finansiell balans etikett
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Konto adress
 BankAccountCountry=Konto land
 BankAccountOwner=Konto ägare namn
 BankAccountOwnerAddress=Konto ägare adress
-RIBControlError=Integritet kontroll av värden misslyckas. Detta innebär att information om detta kontonummer är inte fullständiga eller fel (kontrollera land, siffror och IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Skapa konto
 NewBankAccount=Nytt konto
 NewFinancialAccount=Nya finansiella konto
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Kan förenas
 Conciliate=Reconcile
 Conciliation=Avstämning
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Inkludera stängda konton
 OnlyOpenedAccount=Enbart öppna konton
@@ -104,7 +105,7 @@ SocialContributionPayment=Sociala och skattemässiga betalningar
 BankTransfer=Banköverföring
 BankTransfers=Banköverföringar
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Från
 TransferTo=För att
 TransferFromToDone=En överföring från <b>%s</b> till <b>%s</b> av <b>%s</b> %s har registrerats.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankcheckar
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Visar kontrollera insättning mottagande
-NumberOfCheques=Nb av kontroller
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Tillbaka till konto
 ShowAllAccounts=Visa för alla konton
-FutureTransaction=Transaktioner i Futur. Inget sätt att blidka.
-SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på &quot;Skapa&quot;.
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 43d29bf6673..d371603cb70 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> är en bild av en sann faktura men har ingen bokföring värde.
 InvoiceReplacement=Ersättnings faktura
 InvoiceReplacementAsk=Ersättnings faktura för faktura
-InvoiceReplacementDesc=<b> Ersättning faktura </b> används för att avbryta och byta helt en faktura utan betalningar.<br><br>Anmärkning: Endast fakturor utan betalningar kan bytas ut. Om fakturan du ersätter är ännu inte avslutat, kommer den automatiskt att stängas av "övergivna".
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota att korrigera fakturan
-InvoiceAvoirDesc=Den <b>kreditnota</b> är en negativ faktura används för att lösa det faktum att en faktura har ett värde som skiljer än beloppet verkligen betalat (eftersom kunden betalat för mycket av misstag, eller kommer inte betalas helt sedan han återvände vissa produkter till exempel).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Skapa kreditnota med innehållet i originalfakturan 
 invoiceAvoirWithPaymentRestAmount=Skapa kreditnota med återstående obetald faktura ursprung
 invoiceAvoirLineWithPaymentRestAmount=Kredit notering för återstående obetalda beloppet
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Återbetald
 DeletePayment=Radera betalning
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Leverantörer betalningar
 ReceivedPayments=Mottagna betalningar
 ReceivedCustomersPayments=Inbetalningar från kunder
-PayedSuppliersPayments=Utförda leverantörsbetalningar
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Mottagna kunder betalningar för att validera
 PaymentsReportsForYear=Betalningar rapporter för %s
 PaymentsReports=Betalningar rapporter
@@ -91,8 +91,8 @@ PaymentConditionsShort=Betalningsvillkor
 PaymentAmount=Betalningsbelopp
 ValidatePayment=Bekräfta betalning
 PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala
-HelpPaymentHigherThanReminderToPay=Uppmärksamheten är för betalning är en eller flera räkningar högre än resten att betala. <br> Redigera din post, bekräfta något annat och tänka på att skapa en kreditnota det felaktigt erhållna beloppet för varje överskjutande fakturor.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klassificera "betalda"
 ClassifyPaidPartially=Klassificera "betalda delvis"
 ClassifyCanceled=Klassificera "övergivna"
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Stängd (obetald)
 BillStatusClosedPaidPartially=Betald (delvis)
 BillShortStatusDraft=Utkast
 BillShortStatusPaid=Betald
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Betald
 BillShortStatusCanceled=Övergiven
 BillShortStatusValidated=Validerad
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Stängt
 BillShortStatusClosedPaidPartially=Betald (delvis)
 PaymentStatusToValidShort=För att validera
-ErrorVATIntraNotConfigured=Intracommunautary momsregistreringsnummer ännu inte definierat
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Ingen utebliven betalning läge definieras. Gå till Faktura-modulen setup att fixa detta.
 ErrorCreateBankAccount=Skapa ett bankkonto, då gå till Setup panel Faktura-modul för att definiera betalningssätten
 ErrorBillNotFound=Faktura %s finns inte
-ErrorInvoiceAlreadyReplaced=Fel, du försöker dig på att  godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Fel, rabatt som redan används
 ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belopp
 ErrorInvoiceOfThisTypeMustBePositive=Fel, skall denna typ av faktura har ett positivt belopp
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura som har ersatts av en annan faktura som fortfarande i utkast status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Från
 BillTo=Fakturamottagare
 ActionsOnBill=Åtgärder mot faktura
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag reglerar momsen med en kreditnota.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag godkänner förlust av momsen på denna rabatt.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag återskapar momsen på denna rabatt med en kreditnota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Dålig kund
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter som returneras delvis
 ConfirmClassifyPaidPartiallyReasonOther=Belopp övergivna av annan orsak
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Detta val är möjligt om din faktura har försetts med lämplig kommentar. (Exempel «Endast den skatt som motsvarar det pris som verkligen har betalats ger rätt till avdrag»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=I vissa länder kan detta val är möjlig endast om fakturan innehåller rätt not.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Använd detta val om alla andra inte passar
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=En <b>dålig kund</b> är en kund som vägrar att betala sin skuld.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Detta val används när betalningen är inte fullständig eftersom vissa av produkterna var tillbaka
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Använd detta val om alla andra inte passar, till exempel i följande situation: <br> - Betalning inte fullständig eftersom vissa produkter skickas tillbaka <br> - Belopp som begärs också viktigt eftersom en rabatt glömde <br> I samtliga fall, belopp över gällande måste korrigeras i systemet för bokföring genom att skapa en kreditnota.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Andra
 ConfirmClassifyAbandonReasonOtherDesc=Detta val kommer att användas i alla andra fall. Till exempel därför att du planerar att skapa en ersättning faktura.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validera faktura
 UnvalidateBill=Ovaliderade faktura
-NumberOfBills=Antal av fakturor
-NumberOfBillsByMonth=Antal av fakturor per månad
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Belopp för fakturor
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Visa faktura
@@ -260,9 +262,9 @@ Repeatables=Mallar
 ChangeIntoRepeatableInvoice=Konvertera till fakturamall
 CreateRepeatableInvoice=Skapa fakturamall
 CreateFromRepeatableInvoice=Skapa från fakturamall
-CustomersInvoicesAndInvoiceLines=Kundfakturor och fakturornas linjer
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Kund fakturor och betalningar
-ExportDataset_invoice_1=Kundfakturor listan och fakturornas linjer
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Kund fakturor och betalningar
 ProformaBill=Proforma faktura:
 Reduction=Minskning
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Faktureringsadress
-HelpEscompte=Denna rabatt är en rabatt som kund eftersom betalningen gjordes före sikt.
-HelpAbandonBadCustomer=Detta belopp har övergivits (kund sägs vara en dålig kund) och anses som en exceptionell lös.
-HelpAbandonOther=Detta belopp har övergivits eftersom det var ett misstag (fel kund eller faktura ersättas av en annan till exempel)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Betalning id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Faktura vald
 CloneInvoice=Klon faktura
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Åtgärd funktionshindrade eftersom faktura har ersatts
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Antal utbetalningar
+DescTaxAndDividendsArea=Detta område ger en sammanfattning av alla betalningar för särskilda utgifter. Endast poster med betalning under fasta året ingår här.
+NbOfPayments=No. of payments
 SplitDiscount=Split rabatt i två
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Ingång belopp för var och en av två delar:
-TotalOfTwoDiscountMustEqualsOriginal=Totalt för två nya rabatt måste vara lika med ursprungliga rabatt belopp.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Relaterade faktura
 RelatedBills=Relaterade fakturor
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Senast relaterad faktura
-WarningBillExist=Varning, en eller flera fakturor finns redan
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Kontrollera
 PaymentTypeShortCHQ=Kontrollera
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=På rad betalning
-PaymentTypeShortVAD=På rad betalning
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Utkast
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bankuppgifter
 BankCode=Bankkod
-DeskCode=Reception kod
+DeskCode=Office code
 BankAccountNumber=Kontonummer
-BankAccountNumberKey=Nyckel
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN-nummer
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT nummer
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Betalning genom överföring på följande ko
 VATIsNotUsedForInvoice=* Ej tillämpligt moms konst-293B av CGI
 LawApplicationPart1=Genom tillämpning av lagen 80,335 av 12/05/80
 LawApplicationPart2=Varan förblir egendom
-LawApplicationPart3=säljaren tills hela inlösen av
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=deras pris.
 LimitedLiabilityCompanyCapital=SARL med kapital av
 UseLine=Tillämpa
@@ -463,7 +465,7 @@ Cheques=Kontroller
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Använda kundens faktureringsadress adress i stället för tredje parts adress som mottagare för fakturor
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Visa alla obetalda fakturor
 ShowUnpaidLateOnly=Visa sent obetald faktura endast
 PaymentInvoiceRef=Betalning faktura %s
@@ -474,21 +476,22 @@ Reported=Försenad
 DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar
 CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det inte finns åtminstone på fakturan klassificeras betalt
 ExpectedToPay=Förväntad utbetalning
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Betalas av denna betalning
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
 ListOfYourUnpaidInvoices=Lista över obetalda fakturor
 NoteListOfYourUnpaidInvoices=OBS: Denna lista innehåller bara fakturor för tredje parti som du är kopplade till som en försäljning representant.
 RevenueStamp=Intäkt stämpel
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Faktura modell Crabe. En fullständig faktura modell (Stöd moms alternativet, rabatter, betalningar villkor, logotyp, etc. ..)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Återger nummer med formatet %syymm-nnnn för standardfakturor och %syymm-NNNN för kreditnotor där yy är året, mm månaden och nnnn är en sekvens med ingen paus och ingen återgång till 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 15bc54ee3a1..f878a4bf489 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -1,6 +1,6 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of salu
-CashDesk=Point of salu
+CashDeskMenu=Kassa
+CashDesk=Kassa
 CashDeskBankCash=Bankkonto (kontanter)
 CashDeskBankCB=Bankkonto (kort)
 CashDeskBankCheque=Bankkonto (kontroll)
@@ -11,24 +11,34 @@ CashDeskStock=Lager
 CashDeskOn=på
 CashDeskThirdParty=Tredje part
 ShoppingCart=Kundvagn
-NewSell=Nya säljer
+NewSell=Nyförsäljning
 AddThisArticle=Lägg till den här artikeln
 RestartSelling=Gå tillbaka på sälj
-SellFinished=Sale complete
+SellFinished=Försäljning avslutad
 PrintTicket=Skriv ut biljetten
-NoProductFound=Ingen produkt hittades
-ProductFound=Produkten finns
+NoProductFound=Ingen artikel hittades
+ProductFound=Produkt hittad
 NoArticle=Ingen artikel
 Identification=Identifiering
-Article=Artikeln
-Difference=Skillnaden
+Article=Artikel
+Difference=Skillnad
 TotalTicket=Totalt biljett
-NoVAT=Ingen moms för denna försäljning
-Change=Överskott mottagna
-BankToPay=Account for payment
-ShowCompany=Visar företaget
-ShowStock=Visar lagret
+NoVAT=Momsfri försäljning
+Change=Växel mottagen
+BankToPay=Betalningskonto
+ShowCompany=Visa företag
+ShowStock=Visa lager
 DeleteArticle=Klicka här för att ta bort den här artikeln
 FilterRefOrLabelOrBC=Sök (Ref / etikett)
-UserNeedPermissionToEditStockToUsePos=Du ber att minska lager på faktura skapelse, så användare som använder POS behöver ha behörighet att redigera lager.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Kvittoskrivare
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index 81813814b9d..dbd1cd5e651 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefonsamtal
 ActionAC_FAX=Skicka fax
 ActionAC_PROP=Skicka förslag via e-post
 ActionAC_EMAIL=Skicka e-post
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Möten
 ActionAC_INT=Intervention på plats
 ActionAC_FAC=Skicka kundfaktura med post
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Utforma kommersiella förslag
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sv_SE/dict.lang b/htdocs/langs/sv_SE/dict.lang
index cacce0376e9..7f2c2ecbdd9 100644
--- a/htdocs/langs/sv_SE/dict.lang
+++ b/htdocs/langs/sv_SE/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard-och McDonaldöarna
 CountryVA=Heliga stolen (Vatikanen)
 CountryHN=Honduras
 CountryHK=Hongkong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Indien
 CountryID=Indonesien
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Nordkorea
 CountryKR=Sydkorea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Lettland
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavien
 CountryMN=Mongoliet
 CountryMS=Montserrat
 CountryMZ=Moçambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad och Tobago
 CountryTR=Kalkon
 CountryTM=Turkmenistan
-CountryTC=Turks-och Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupier
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norska Krones
-CurrencySingNOK=Norska kronor
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisiska dinarer
 CurrencySingTND=Tunisisk dinar
 CurrencyUSD=US-dollar
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Anställd
 DemandReasonTypeSRC_SPONSORING=Sponsor
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 5ee5d95bcb1..727e3a6733f 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb av dokument i katalogen
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manuell katalog
 ECMSectionAuto=Automatisk katalog
@@ -34,6 +34,8 @@ ECMDocsByProjects=Handlingar som är kopplade till projekt
 ECMDocsByUsers=Dokument länkade till användare
 ECMDocsByInterventions=Dokument länkade till ärenden
 ECMDocsByExpenseReports=Dokument länkade till utgiftsrapporter
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Ingen katalog skapas
 ShowECMSection=Visa katalog
 DeleteSection=Ta bort katalog
@@ -46,6 +48,5 @@ ECMSelectASection=Välj en mapp i trädet...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Uppdatera lista med mappar
 HashOfFileContent=Hash av filinnehåll
-FileNotYetIndexedInDatabase=Filen är inte indexerad i databasen (försök ladda upp igen)
-FileSharedViaALink=Fil delad via länk
 NoDirectoriesFound=Inga mappar funna
+FileNotYetIndexedInDatabase=Filen är inte indexerad i databasen (försök ladda upp igen)
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index f8d0a502321..20500f59203 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/help.lang b/htdocs/langs/sv_SE/help.lang
index 8669037f3fb..696e7f5bdaa 100644
--- a/htdocs/langs/sv_SE/help.lang
+++ b/htdocs/langs/sv_SE/help.lang
@@ -5,22 +5,19 @@ RemoteControlSupport=Online realtid / fjärrsupport
 OtherSupport=Annat stöd
 ToSeeListOfAvailableRessources=För att kontakta / se tillgängliga resurser:
 HelpCenter=Hjälpcenter
-DolibarrHelpCenter=Dolibarr Hjälp-och supportcenter
-ToGoBackToDolibarr=Annars klickar du på <a href="%s">att här använda Dolibarr</a>
-TypeOfSupport=Källa till stöd
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Gemenskapen (gratis)
 TypeSupportCommercial=Kommersiella
 TypeOfHelp=Typ
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=Behöver du hjälp eller stöd?
 Efficiency=Effektivitet
 TypeHelpOnly=Hjälp endast
 TypeHelpDev=Hjälp + Utveckling
-TypeHelpDevForm=Hjälp + Utveckling + Formation
-ToGetHelpGoOnSparkAngels1=Vissa företag kan ge en snabb (ibland omedelbart) och effektivare online support genom att ta kontroll över din dator. Sådana medhjälpare finns på <b>%s</b> webbplats:
-ToGetHelpGoOnSparkAngels3=Du kan också gå till listan över alla tillgängliga bussar för Dolibarr, för detta, klicka på knappen
-ToGetHelpGoOnSparkAngels2=Ibland finns det inget företag finns tillgängliga då du gör din sökning, så tänk att byta filter till för &quot;alla tillgängliga&quot;. Du kommer att kunna skicka fler förfrågningar.
-BackToHelpCenter=Annars, här klickar du gå <a href="%s">tillbaka för att hjälpa hemsida centrum</a> .
-LinkToGoldMember=Du kan ringa en av de tränare förvalda genom Dolibarr för ditt språk (%s) genom att klicka på hans Widget (status och högsta pris uppdateras automatiskt):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Språk som stöds
-SubscribeToFoundation=Hjälp Dolibarr projektet, prenumerera på stiftelsen
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=För officiell Dolibarr support på ditt språk: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 6644a2fb337..fee4a25fe18 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Löv
-CPTitreMenu=Löv
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Månatlig rapport
 MenuAddCP=Ny ledighetsansökan
-NotActiveModCP=Du måste aktivera modulen Löv att se denna sida.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Gör en förfrågan ledighet
 DateDebCP=Startdatum
 DateFinCP=Slutdatum
@@ -15,13 +15,18 @@ ApprovedCP=Godkänd
 CancelCP=Annullerad
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=Lista över blad
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Beskrivning
 SendRequestCP=Skapa permission begäran
 DelayToRequestCP=Lämna begäran måste göras <b>minst %s dag (ar) </b> före dem.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Lämnar balans <b>är %s</b> dagar.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Du måste välja ett slutdatum senare än startdatum.
 ErrorSQLCreateCP=Ett SQL-fel uppstod under skapandet:
 ErrorIDFicheCP=Ett fel har uppstått, inte existerar begäran ledighet.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Du har inte behörighet att läsa denna ledighet begäran.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Begäran från
 TitreRequestCP=Lämna begäran
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Antal dagars semester konsumeras
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Redigera
 DeleteCP=Ta bort
 ActionRefuseCP=Vägra
@@ -59,6 +71,7 @@ DateRefusCP=Datum för avslag
 DateCancelCP=Datum för annullering
 DefineEventUserCP=Tilldela en exceptionell ledighet för en användare
 addEventToUserCP=Tilldela ledighet
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=Användare
 ErrorAddEventToUserCP=Ett fel uppstod när den exceptionella ledighet.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Uppdaterats.
 Module27130Name= Hantering av ledighet förfrågningar
 Module27130Desc= Hantering av ledighet förfrågningar
@@ -94,7 +112,7 @@ NoticePeriod=Uppsägningstid
 HolidaysToValidate=Validera ledighets förfrågningar
 HolidaysToValidateBody=Nedan finns en ledighet begäran om att validera
 HolidaysToValidateDelay=Denna ledighet begäran kommer att ske inom en period på mindre än %s dagar.
-HolidaysToValidateAlertSolde=Användaren som gjort detta lämnar de krävs inte har tillräckligt med tillgängliga dagar.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validerade ledighets förfrågningar
 HolidaysValidatedBody=Din ledighets begäran om %s till %s har validerats.
 HolidaysRefused=Begäran nekades
@@ -103,4 +121,9 @@ HolidaysCanceled=Annulleras leaved begäran
 HolidaysCanceledBody=Din ledighet begäran om %s till %s har avbrutits.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Gå in på  <strong>Hem - Setup - Bibliotek - Typ av ledighet</strong> för att ställa in olika varianter av ledigheter.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index 2408595ce38..782e4c0fd73 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Följ bara instruktionerna steg för steg.
 MiscellaneousChecks=Förutsättningar kontrolleras
 ConfFileExists=Konfigurationsfilen <b>%s</b> finns.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurationsfilen <b>%s</b> finns inte och kunde inte skapas!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Konfigurationsfil <b>%s</b> skulle kunna skapas.
-ConfFileIsNotWritable=Konfigurationsfilen <b>%s</b> är inte skrivbar. Kontrollera behörigheter. För den första installationen, måste din webbserver beviljas för att kunna skriva i denna fil under konfigurationen ("chmod 666" till exempel på en UNIX-liknande OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Konfigurationsfilen <b>%s</b> är skrivbar.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Ladda all information från konfigurationsfilen.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=Detta stöder PHP sessioner.
 PHPSupportPOSTGETOk=Detta stöder PHP variabler POST och GET.
-PHPSupportPOSTGETKo=Det är möjligt din PHP-installation inte stöder variabler POST eller GET. Kontrollera din parameter <b>variables_order</b> i php.ini.
-PHPSupportGD=Denna PHP stöd GD grafiska funktioner.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Denna PHP stöd UTF8 funktioner.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Din PHP max session minne är inställt på <b>%s.</b> Detta bör vara nog.
-PHPMemoryTooLow=Din PHP max session minne är inställt på <b>%s</b> byte. Detta bör vara för låg. Ändra din <b>php.ini</b> för att ställa <b>memory_limit</b> parameter till minst <b>%s</b> byte.
-Recheck=Klicka här för en mer signifikant test
-ErrorPHPDoesNotSupportSessions=Din PHP-installation inte stöd sessioner. Denna funktion är skyldig att Dolibarr fungerar. Kolla din PHP-konfiguration.
-ErrorPHPDoesNotSupportGD=Din PHP installation saknar stöd för grafisk funktion GD. Inga diagram kommer att finnas tillgängliga.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Din PHP-installation inte stöd för UTF8 funktioner. Dolibarr kan inte fungera korrekt. Lösa det här innan du installerar Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Nummer %s finns inte.
-ErrorGoBackAndCorrectParameters=Gå tillbaka och rätta till felaktiga parametrar.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Du kan ha skrivit fel värde för parametern &quot;%s&quot;.
 ErrorFailedToCreateDatabase=Misslyckades med att skapa databasen %s.
 ErrorFailedToConnectToDatabase=Det gick inte att ansluta till databasen &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Databasens version (%s) för gammal. Version %s eller senare krävs.
 ErrorPHPVersionTooLow=PHP version gamla också. Version %s krävs.
-ErrorConnectedButDatabaseNotFound=Anslutning till servern framgångsrik, men databasen %s finns inte.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Databas &quot;%s&quot; finns redan.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Om databasen inte finns, gå tillbaka och kontrollera alternativet &quot;Create database&quot;.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Om databasen redan finns, gå tillbaka och avmarkera &quot;Skapa databasen&quot; valen.
-WarningBrowserTooOld=För gammal version av webbläsare. Uppgradering av din webbläsare till en sen utgåva av Firefox, Chrome eller Opera är högeligen rekommenderad.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Använda licens
 ConfigurationFile=Konfigurationsfil
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Databas typ
 DriverType=Driver typ
 Server=Server
-ServerAddressDescription=Namn eller IP-adress för databasserver, vanligtvis &quot;localhost&quot; när databasservern är värd för på samma server än webbserver
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Databasservern hamn. Håll tom om okänd.
 DatabaseServer=Databasservern
 DatabaseName=Databas namn
-DatabasePrefix=Databas prefix tabellen
-AdminLogin=Logga in för Dolibarr databas ägaren.
-PasswordAgain=Skriv lösenordet en andra gång
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Lösenord för Dolibarr databas ägaren.
 CreateDatabase=Skapa databas
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Databasserver - superanvändare tillgång
-CheckToCreateDatabase=Kryssrutan om databasen inte existerar och måste skapas. <br> I så fall måste du fylla i login / lösenord för superanvändare konto längst ner på denna sida.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Logga in på användaren möjlighet att skapa nya databaser eller nya användare, värdelösa om din databas och databasen inloggning redan finns (som när du är värd ett webbhotell leverantör).
-KeepEmptyIfNoPassword=Lämna tomt om användaren har inget lösenord (undvik detta)
-SaveConfigurationFile=Spara värden
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Serveranslutning
 DatabaseCreation=Databas skapas
 CreateDatabaseObjects=Databasobjekt skapande
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Skapa främmande nycklar och index för tabell %s
 OtherKeysCreation=Främmande nycklar och index skapande
 FunctionsCreation=Funktioner skapande
 AdminAccountCreation=Administratören logik skapande
-PleaseTypePassword=Skriv in ett lösenord, är tomma lösenord tillåts inte!
-PleaseTypeALogin=Skriv en in!
-PasswordsMismatch=Lösenord skiljer sig, försök igen!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Slutet av installationen
 SystemIsInstalled=Denna installation är klar.
 SystemIsUpgraded=Dolibarr har uppgraderats med framgång.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Du måste konfigurera Dolibarr till era behov (utseend
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Gå till Dolibarr
 GoToSetupArea=Gå till Dolibarr (setup-området)
-MigrationNotFinished=Version av databasen är inte helt uppdaterad, så du måste köra uppgraderingen igen.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Gå till uppgradering sida igen
 WithNoSlashAtTheEnd=Utan ett snedstreck &quot;/&quot; i slutet
-DirectoryRecommendation=Det är rekommenderat att använda en katalog utanför din katalog av dina webbsidor.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Redan finns
 DolibarrAdminLogin=Dolibarr admin logik
-AdminLoginAlreadyExists=Dolibarr administratörskonto <b>&quot;%s&quot;</b> finns redan.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Varning, av säkerhetsskäl, när installera eller uppgradera är klar, bör du ta bort <b>installationskatalogen eller döp om den till install.lock för att undvika dess skadliga användning.</b>
-FunctionNotAvailableInThisPHP=Ej tillgängligt för denna PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Välj migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script bearbetning
 ChooseYourSetupMode=Välj din setup-funktionen och klicka på &quot;Start&quot; ...
 FreshInstall=Ny installation
-FreshInstallDesc=Använd detta läge om detta är din första installation. Om inte, kan det här läget reparera en ofullständig tidigare installera, men om du vill uppgradera din version, välj &quot;Upgrade&quot;-läge.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Uppgradera
 UpgradeDesc=Använd detta läge om du har ersatt gamla Dolibarr filer med filer från en nyare version. Detta kommer att uppgradera din databas och data.
 Start=Start
 InstallNotAllowed=Setup tillåts inte av <b>conf.php</b> behörigheter
 YouMustCreateWithPermission=Du måste skapa filen %s och sätta skrivrättigheter på den för den webbserver under installationsprocessen.
-CorrectProblemAndReloadPage=Vänligen rätta till problemet och pressen F5 ladda om sidan.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Redan har övergått
 DatabaseVersion=Databas version
 ServerVersion=Databasservern version
 YouMustCreateItAndAllowServerToWrite=Du måste skapa denna katalog och möjliggöra för webbservern att skriva in i den.
 DBSortingCollation=Tecken sorteringsordning
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Du ber att skapa databasen <b>%s,</b> men för detta Dolibarr behöver ansluta till servern <b>%s</b> med super user <b>%s</b> behörigheter.
-YouAskLoginCreationSoDolibarrNeedToConnect=Du ber att skapa login <b>%s</b> databas, men för detta Dolibarr behöver ansluta till servern <b>%s</b> med super user <b>%s</b> behörigheter.
-BecauseConnectionFailedParametersMayBeWrong=Som anslutning misslyckades, måste värd-eller super parametrar användaren vara fel.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans betalning påvisas med metoden %s
 RemoveItManuallyAndPressF5ToContinue=Ta bort den manuellt och trycka på F5 för att fortsätta.
 FieldRenamed=Fält bytt namn
-IfLoginDoesNotExistsCheckCreateUser=Om inloggningen inte finns ännu, måste du kontrollera alternativet &quot;Skapa användare&quot;
-ErrorConnection=Server <b>&quot;%s&quot;,</b> databasens namn <b>&quot;%s&quot;</b> login <b>&quot;%s&quot;</b> eller databas lösenord kan vara felaktiga eller PHP klientversionen kan vara för gamla, medan databas version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Rekommenderat val att installera version <b>%s</b> från din nuvarande version <b>%s</b>
 InstallChoiceSuggested=<b>Installera val föreslås av installationsprogrammet.</b>
-MigrateIsDoneStepByStep=De riktade versionen (%s) har en lucka på flera versioner, så installerar guiden kommer tillbaka att föreslå nästa migration när detta kommer att vara klar.
-CheckThatDatabasenameIsCorrect=Kontrollera att databasen namnet <b>&quot;%s&quot;</b> är korrekt.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Om detta namn är korrekta och att databasen ännu inte finns, måste du kontrollera alternativet &quot;Create database&quot;.
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Du markerat rutan &quot;Skapa databas&quot;. För detta måste du ange användarnamn / lösenord för superanvändare (längst ned i formuläret).
-YouAskToCreateDatabaseUserSoRootRequired=Du markerat rutan &quot;Skapa databas ägare&quot;. För detta måste du ange användarnamn / lösenord för superanvändare (längst ned i formuläret).
-NextStepMightLastALongTime=Aktuella steget kan ta flera minuter. Vänta tills nästa skärm visas helt innan du fortsätter.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrera leverans för kundorder lagring
 MigrationShippingDelivery=Bli lagring av frakt
 MigrationShippingDelivery2=Bli lagring av sjöfarten 2
 MigrationFinished=Migration färdiga
-LastStepDesc=<strong>Sista steget:</strong> Definiera här login och lösenord som du planerar att använda för att ansluta till programmet. Tappa inte detta eftersom det är det konto för att administrera alla andra.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Aktivera modul %s
 ShowEditTechnicalParameters=Klicka här för att visa / redigera avancerade parametrar (expertläge)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Din databas är av version %s. Den har en kritisk bugg vilket gör dataförluster om du gör strukturförändringar på din databas, som det krävs av migrationsprocessen. För detta skäl, kommer migrationen inte tillåtas förrän du uppgraderat din databas till en nyare fast version (lista över kända buggade versioner:%s)
-KeepDefaultValuesWamp=Du använder Dolibarr inställningsguiden från DoliWamp, värden så som här föreslås är redan optimerade. Ändra dem bara om du vet vad du gör.
-KeepDefaultValuesDeb=Du använder Dolibarr inställningsguiden från en Ubuntu eller Debian, så värden som här föreslås är redan optimerade. Endast lösenord i databasen ägaren för att skapa måste fyllas. Ändra andra parametrar om du vet vad du gör.
-KeepDefaultValuesMamp=Du använder Dolibarr inställningsguiden från DoliMamp, värden så som här föreslås är redan optimerade. Ändra dem bara om du vet vad du gör.
-KeepDefaultValuesProxmox=Du använder Dolibarr inställningsguiden från en Proxmox virtuell apparat, så som föreslås här är redan optimerade. Ändra dem bara om du vet vad du gör.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrering av data för kommersiella förslag
 MigrationInvoice=Migrering av data för kundens fakturor
 MigrationContract=Migrering av data för kontrakt
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Bli framgångsrik
 MigrationUpdateFailed=Misslyckades uppgraderingsprocessen
 MigrationRelationshipTables=Migrering av data för relation tabeller (%s)
 MigrationPaymentsUpdate=Betalning data korrigering
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Kontrakt data korrigering
 MigrationContractsNumberToUpdate=%s kontrakt (s) att uppdatera
 MigrationContractsLineCreation=Skapa kontrakt linje för %s kontrakt ref
 MigrationContractsNothingToUpdate=Inga fler saker att göra
-MigrationContractsFieldDontExist=Fält fk_facture inte existerar längre. Ingenting att göra.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Kontrakt tom datum korrigering
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Inga kontrakt tom datum för att korrigera
 MigrationContractsEmptyCreationDatesNothingToUpdate=Inget avtal datum för skapande att korrigera
 MigrationContractsInvalidDatesUpdate=Bad valuteringsdag kontrakt korrigering
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Leverans uppdatering
 MigrationStockDetail=Uppdatering lager Värdet av produkter
 MigrationMenusDetail=Uppdatera dynamiska menyer tabeller
 MigrationDeliveryAddress=Uppdatera leveransadress i transporter
-MigrationProjectTaskActors=Migrering av data för llx_projet_task_actors bord
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migrationsområdet fk_user_resp av llx_projet till llx_element_contact
 MigrationProjectTaskTime=Uppdatera tid i sekunder
 MigrationActioncommElement=Uppdatera uppgifter om åtgärder
 MigrationPaymentMode=Datamigrering betalning mode
 MigrationCategorieAssociation=Migreringskategorier
-MigrationEvents=Överföring av händelser för att lägga till händelseägaren i uppdragslista
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Visa ej tillgängliga val
-HideNotAvailableOptions=Dölj ej tillgängliga val
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 21a26dc7b3f..25e732b604e 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Kontakter till denna tredje part
 ContactsAddressesForCompany=Kontakter / adresser för denna tredje part
 AddressesForCompany=Adresser för denna tredje part
 ActionsOnCompany=Åtgärder om denna tredje part
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Händelser om denna medlem
 ActionsOnProduct=Events about this product
 NActionsLate=%s sent
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Räkningar
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Fil delad via länk
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index a751e08a1d2..7bb42882bab 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Länkat objekt
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Beskrivning
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang
index 4d65e4dda61..0c8aa46aeda 100644
--- a/htdocs/langs/sv_SE/paybox.lang
+++ b/htdocs/langs/sv_SE/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox modul setup
 PayBoxDesc=Denna modul erbjuder sidor för att möjliggöra betalning på <a href="http://www.paybox.com" target="_blank">Paybox</a> av kunder. Detta kan användas för en kostnadsfri betalning eller en betalning på en viss Dolibarr objekt (faktura, order, ...)
 FollowingUrlAreAvailableToMakePayments=Följande webbadresser finns att erbjuda en sida till en kund att göra en förskottsbetalning Dolibarr objekt
 PaymentForm=Inbetalningskort
-WelcomeOnPaymentPage=Välkommen till vår online betalningssystem
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=Denna skärm tillåter dig att göra en online-betalning till %s.
 ThisIsInformationOnPayment=Detta är information om betalning för att göra
 ToComplete=För att komplettera
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL för att erbjuda en %s online gränssn
 ToOfferALinkForOnlinePaymentOnContractLine=URL för att erbjuda en %s online gränssnitt betalning användare för ett kontrakt linje
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL för att erbjuda en %s online gränssnitt betalning användare för en fri belopp
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL för att erbjuda en %s online gränssnitt betalning användare för en medlem prenumeration
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Du kan också lägga till url parameter <b>&tag = <i>värde</i></b> för någon av dessa URL (krävs endast för gratis betalning) för att lägga till din egen kommentar tagg betalning.
-SetupPayBoxToHavePaymentCreatedAutomatically=Konfigurera din PayBox med url <b>%s</b> ha betalning skapas automatiskt när validerats av paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Den här sidan bekräftar att din betalning har registrerats. Tack.
-YourPaymentHasNotBeenRecorded=Din betalning inte har registrerats och transaktionen har avbrutits. Tack.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Tagen parametrar
 UsageParameter=Användning parametrar
 InformationToFindParameters=Hjälp att hitta din %s kontoinformation
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index 50a3e5e48ec..6183426e1f6 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Undertecknats (behov fakturering)
 PropalStatusNotSigned=Inte undertecknat (stängt)
 PropalStatusBilled=Fakturerade
 PropalStatusDraftShort=Förslag
-PropalStatusValidatedShort=Validerade
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Stängt
 PropalStatusSignedShort=Signerad
 PropalStatusNotSignedShort=Inte undertecknat
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s hittades inte
 AddToDraftProposals=Lägg till förslagsutkast
 NoDraftProposals=Inga förslagsutkast 
 CopyPropalFrom=Skapa kommersiella förslag genom att kopiera befintliga förslaget
-CreateEmptyPropal=Skapa tomma kommersiella förslag VIERGE eller från förteckningen över produkter / tjänster
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Standard kommersiella förslag giltighet längd (i dagar)
-UseCustomerContactAsPropalRecipientIfExist=Använd kundkontakt adress om definieras i stället för tredje parts adress som förslag mottagaradressen
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Klon kommersiella förslag
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Kundkontakt följa upp förslag
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Ett fullständigt förslag modell (logo. ..)
+DocModelCyanDescription=Ett fullständigt förslag modell (logo. ..)
 DefaultModelPropalCreate=Skapa standardmodell
 DefaultModelPropalToBill=Standardmall när ett affärsförslag sluts (att fakturera)
 DefaultModelPropalClosed=Standardmall när ett affärsförslag sluts (ofakturerat)
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 328a805b077..7661206a0a1 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Läsa
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 08508d4e6e8..8d6e8e39b04 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 1d42581c344..37a1d03a2d3 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index f76ff018f9d..ed988d580e2 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/sw_SW/commercial.lang
+++ b/htdocs/langs/sw_SW/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sw_SW/dict.lang b/htdocs/langs/sw_SW/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/sw_SW/dict.lang
+++ b/htdocs/langs/sw_SW/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sw_SW/help.lang b/htdocs/langs/sw_SW/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/sw_SW/help.lang
+++ b/htdocs/langs/sw_SW/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 100a249f418..b3ea678aea0 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/sw_SW/paybox.lang b/htdocs/langs/sw_SW/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/sw_SW/paybox.lang
+++ b/htdocs/langs/sw_SW/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/sw_SW/propal.lang
+++ b/htdocs/langs/sw_SW/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 6145570691a..24216389685 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=ปิดใช้งานคุณลักษณะใ
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=องค์ประกอบเฉพาะจาก <a href="%s">โมดูลที่เปิดใช้งาน</a> จะแสดง
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=เครื่องมือโมดูลหลาย
 ModuleFamilyExperimental=โมดูลทดลอง
 ModuleFamilyFinancial=โมดูลการเงิน (บัญชี / กระทรวงการคลัง)
 ModuleFamilyECM=การจัดการเนื้อหาอิเล็กทรอนิกส์ (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=รถยกเมนู
 MenuAdmin=แก้ไขเมนู
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=ผู้ใช้และกลุ่ม
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=บริษัท และการจัดการรายชื่อผู้ติดต่อ (ลูกค้ากลุ่มเป้าหมาย ... )\n
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=เชิงพาณิชย์
 Module2Desc=การจัดการเชิงพาณิชย์
 Module10Name=การบัญชี
@@ -501,7 +501,7 @@ Module23Desc=การตรวจสอบการใช้พลังงา
 Module25Name=คำสั่งซื้อของลูกค้า
 Module25Desc=การบริหารลูกค้าสั่งซื้อ
 Module30Name=ใบแจ้งหนี้
-Module30Desc=ใบแจ้งหนี้และการจัดการใบลดหนี้สำหรับลูกค้า การจัดการใบแจ้งหนี้สำหรับซัพพลายเออร์
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=ซัพพลายเออร์
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=ภาษีมูลค่าเพิ่มราคาหรื
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=เงื่อนไขการชำระเงิน
 DictionaryPaymentModes=โหมดการชำระเงิน
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=รูปแบบกระดาษ
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=รายงานภาษีท้องถิ่นรว
 LabelUsedByDefault=ฉลากใช้โดยเริ่มต้นถ้าแปลไม่สามารถพบได้สำหรับรหัส
 LabelOnDocuments=ป้ายเกี่ยวกับเอกสาร
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=ในตอนท้ายของเดือน
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=ตรวจสอบเหตุการณ์การรักษาความปลอดภัย
-Audit=การตรวจสอบบัญชี
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=ชื่อเบราว์เซอร์
 BrowserOS=ระบบปฏิบัติการเบราว์เซอร์
 ListOfSecurityEvents=รายการ Dolibarr เหตุการณ์การรักษาความปลอดภัย
 SecurityEventsPurged=เหตุการณ์การรักษาความปลอดภัยกำจัด
-LogEventDesc=คุณสามารถเปิดใช้การเข้าสู่ระบบที่นี่สำหรับ Dolibarr เหตุการณ์การรักษาความปลอดภัย <b>ผู้ดูแลระบบแล้วสามารถมองเห็นเนื้อหาผ่านทางเครื่องมือของระบบเมนู - ตรวจสอบ</b> คำเตือนคุณลักษณะนี้สามารถใช้ข้อมูลจำนวนมากในฐานข้อมูล
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
 SystemAreaForAdminOnly=บริเวณนี้เป็นที่ใช้ได้สำหรับผู้ใช้ผู้ดูแลระบบเท่านั้น ไม่มีสิทธิ์ Dolibarr สามารถลดขีด จำกัด นี้
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=ขั้นตอนของช่วงปัดเศ
 UnitPriceOfProduct=ราคาต่อหน่วยสุทธิของผลิตภัณฑ์
 TotalPriceAfterRounding=ราคารวม (บาท / ถัง / รวมภาษี) หลังจากการปัดเศษ
 ParameterActiveForNextInputOnly=พารามิเตอร์ที่มีประสิทธิภาพสำหรับการป้อนข้อมูลต่อไปเท่านั้น
-NoEventOrNoAuditSetup=เหตุการณ์การรักษาความปลอดภัยที่ไม่ได้รับการบันทึกไว้ยัง นี้จะมีการตรวจสอบตามปกติถ้าไม่ได้รับการเปิดใช้งานบน "การตั้งค่า - การรักษาความปลอดภัย - การตรวจสอบหน้า"
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=ดูการตั้งค่าของคุณ sendmail ท้องถิ่น
 BackupDesc=เพื่อให้การสำรองข้อมูลที่สมบูรณ์ของ Dolibarr คุณต้อง:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=คุณลักษณะเสริม (เส้นตามลำดับ)
 ExtraFieldsSupplierInvoicesLines=คุณลักษณะเสริม (เส้นใบแจ้งหนี้)
 ExtraFieldsThirdParties=คุณลักษณะเสริม (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=คุณลักษณะเสริม (สมาชิก)
 ExtraFieldsMemberType=คุณลักษณะเสริม (ประเภทสมาชิก)
 ExtraFieldsCustomerInvoices=คุณลักษณะเสริม (ใบแจ้งหนี้)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=รายการของการแจ้งเตือนคงที่
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=ธรณีประตู
 BackupDumpWizard=ตัวช่วยสร้างการสร้างแฟ้มการถ่ายโอนการสำรองฐานข้อมูล
 SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=ไปรษณีย์
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index e048ac8042b..cfa95c3084f 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -7,7 +7,7 @@ BankName=ชื่อธนาคาร
 FinancialAccount=บัญชี
 BankAccount=บัญชีเงินฝาก
 BankAccounts=บัญชีเงินฝากธนาคาร
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=แสดงบัญชี
 AccountRef=อ้างอิงบัญชีการเงิน
 AccountLabel=ป้ายชื่อบัญชีการเงิน
@@ -46,7 +46,7 @@ BankAccountDomiciliation=ที่อยู่บัญชี
 BankAccountCountry=ประเทศบัญชี
 BankAccountOwner=ชื่อเจ้าของบัญชี
 BankAccountOwnerAddress=ที่อยู่เจ้าของบัญชี
-RIBControlError=ตรวจสอบความสมบูรณ์ของค่าล้มเหลว ซึ่งหมายความว่าข้อมูลเลขที่บัญชีนี้จะไม่ได้สมบูรณ์หรือไม่ถูกต้อง (ตรวจสอบประเทศตัวเลขและ IBAN)
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=สร้างบัญชี
 NewBankAccount=บัญชีใหม่
 NewFinancialAccount=บัญชีทางการเงินใหม่
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=สามารถคืนดี
 Conciliate=คืนดี
 Conciliation=การประนีประนอม
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=รวมบัญชีปิด
 OnlyOpenedAccount=เปิดเฉพาะบัญชี
@@ -104,7 +105,7 @@ SocialContributionPayment=สังคม / ชำระภาษีการค
 BankTransfer=โอนเงินผ่านธนาคาร
 BankTransfers=ธนาคารโอน
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=จาก
 TransferTo=ไปยัง
 TransferFromToDone=<b>การถ่ายโอนจาก% s% s% s%</b> s ได้รับการบันทึก
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=เช็คธนาคาร
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=แสดงการตรวจสอบการรับเงินฝาก
-NumberOfCheques=nb ของการตรวจสอบ
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=กลับไปที่บัญชี
 ShowAllAccounts=แสดงสำหรับบัญชีทั้งหมด
-FutureTransaction=การทำธุรกรรมในอนาคต วิธีที่จะประนีประนอมไม่มี
-SelectChequeTransactionAndGenerate=เลือก / การตรวจสอบตัวกรองที่จะรวมเข้าไปในการรับฝากเช็คและคลิกที่ "สร้าง"
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=เลือกบัญชีธนาคารที่เกี่ยวข้องกับการเจรจาต่อรอง ใช้ค่าตัวเลขจัดเรียง: YYYYMM หรือ YYYYMMDD
 EventualyAddCategory=ในที่สุดระบุหมวดหมู่ในการที่จะจำแนกบันทึก
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index f9f077e12c7..a5bcdd1a4af 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=ใบแจ้งหนี้ Proforma
 InvoiceProFormaDesc=<b>ใบแจ้งหนี้ Proforma</b> คือภาพของใบแจ้งหนี้ที่แท้จริง แต่มีค่าไม่มีบัญชี
 InvoiceReplacement=เปลี่ยนใบแจ้งหนี้
 InvoiceReplacementAsk=ใบแจ้งหนี้แทนใบแจ้งหนี้
-InvoiceReplacementDesc=<b>เปลี่ยนใบแจ้งหนี้จะใช้ในการยกเลิกและแทนที่สมบูรณ์ใบแจ้งหนี้ที่มีการชำระเงินไม่รับแล้ว</b> <br><br> หมายเหตุ: เฉพาะใบแจ้งหนี้ที่มีการชำระเงินไม่มีก็สามารถที่จะเข้ามาแทนที่ หากใบแจ้งหนี้ที่จะเปลี่ยนยังไม่ปิดก็จะถูกปิดโดยอัตโนมัติเพื่อให้ 'ละทิ้ง'
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=ใบลดหนี้
 InvoiceAvoirAsk=ใบลดหนี้ใบแจ้งหนี้ที่ถูกต้อง
-InvoiceAvoirDesc=<b>ใบลดหนี้ใบแจ้งหนี้เป็นเชิงลบที่ใช้ในการแก้ปัญหาความจริงที่ว่าใบแจ้งหนี้ที่มีจำนวนเงินที่แตกต่างกว่าจำนวนเงินที่จ่ายจริง</b> (เพราะลูกค้าจ่ายเงินมากเกินไปจากข้อผิดพลาดหรือจะไม่ได้ชำระเงินสมบูรณ์ตั้งแต่เขากลับผลิตภัณฑ์บางอย่างเช่น)
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=สร้างหมายเหตุเครดิตที่มีเส้นใบแจ้งหนี้จากแหล่งกำเนิด
 invoiceAvoirWithPaymentRestAmount=สร้างหนี้ที่ค้างชำระที่เหลืออยู่กับใบแจ้งหนี้ต้นกำเนิด
 invoiceAvoirLineWithPaymentRestAmount=หมายเหตุเครดิตสำหรับจำนวนเงินที่เหลือยังไม่ได้ชำระ
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=จ่ายคืน
 DeletePayment=ลบการชำระเงิน
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=การชำระเงินที่ผู้ซื้อผู้ขาย
 ReceivedPayments=การชำระเงินที่ได้รับ
 ReceivedCustomersPayments=การชำระเงินที่ได้รับจากลูกค้า
-PayedSuppliersPayments=การชำระเงิน payed กับซัพพลายเออร์
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=การชำระเงินของลูกค้าที่ได้รับการตรวจสอบ
 PaymentsReportsForYear=รายงานการชำระเงินสำหรับ% s
 PaymentsReports=รายงานการชำระเงิน
@@ -91,8 +91,8 @@ PaymentConditionsShort=เงื่อนไขการชำระเงิน
 PaymentAmount=จำนวนเงินที่ชำระ
 ValidatePayment=ตรวจสอบการชำระเงิน
 PaymentHigherThanReminderToPay=การชำระเงินที่สูงกว่าการแจ้งเตือนที่จะต้องจ่าย
-HelpPaymentHigherThanReminderToPay=ความสนใจจำนวนเงินที่ชำระของหนึ่งหรือมากกว่าค่าใช้จ่ายที่สูงกว่าส่วนที่เหลือจะจ่าย <br> แก้ไขรายการของคุณมิฉะนั้นยืนยันและคิดเกี่ยวกับการสร้างใบลดหนี้ส่วนเกินที่ได้รับสำหรับแต่ละใบแจ้งหนี้ชำระเงินส่วนเกิน
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=จำแนก 'ชำระเงิน'
 ClassifyPaidPartially=จำแนก 'ชำระบางส่วน'
 ClassifyCanceled=จำแนก 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=ปิดให้บริการ (ค้างชำ
 BillStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
 BillShortStatusDraft=ร่าง
 BillShortStatusPaid=ต้องจ่าย
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=ต้องจ่าย
 BillShortStatusCanceled=ถูกปล่อยปละละเลย
 BillShortStatusValidated=ผ่านการตรวจสอบ
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=ปิด
 BillShortStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
 PaymentStatusToValidShort=ในการตรวจสอบ
-ErrorVATIntraNotConfigured=หมายเลข VAT Intracommunautary ยังไม่ได้กำหนดไว้
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=ไม่มีโหมดการชำระเงินค่าเริ่มต้นที่กำหนดไว้ ไปที่ใบแจ้งหนี้การติดตั้งโมดูลการแก้ไขปัญหานี้
 ErrorCreateBankAccount=สร้างบัญชีธนาคารแล้วไปที่แผงติดตั้งโมดูลใบแจ้งหนี้ในการกำหนดรูปแบบการชำระเงิน
 ErrorBillNotFound=ใบแจ้งหนี้% s ไม่ได้อยู่
-ErrorInvoiceAlreadyReplaced=ข้อผิดพลาดที่คุณพยายามที่จะตรวจสอบใบแจ้งหนี้ที่จะเปลี่ยนใบแจ้งหนี้% s แต่คนนี้ได้ถูกแทนที่ด้วยใบแจ้งหนี้% s
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=ข้อผิดพลาดลดที่ใช้แล้ว
 ErrorInvoiceAvoirMustBeNegative=ข้อผิดพลาดในใบแจ้งหนี้ที่ถูกต้องจะต้องมีมูลค่าติดลบ
 ErrorInvoiceOfThisTypeMustBePositive=ข้อผิดพลาดประเภทของใบแจ้งหนี้นี้จะต้องมีจำนวนเงินที่เป็นบวก
 ErrorCantCancelIfReplacementInvoiceNotValidated=ข้อผิดพลาดที่ไม่สามารถยกเลิกใบแจ้งหนี้ที่ได้รับการแทนที่ด้วยใบแจ้งหนี้อื่นที่ยังคงอยู่ในสถานะร่าง
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=จาก
 BillTo=ไปยัง
 ActionsOnBill=การดำเนินการในใบแจ้งหนี้
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=ที่เหลือยังไม่ได้ชำระ <b>(% s% s)</b> เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ผมระเบียบภาษีมูลค่าเพิ่มที่มีใบลดหนี้
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=ที่เหลือยังไม่ได้ชำระ <b>(% s% s)</b> เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ฉันยอมรับที่จะสูญเสียภาษีมูลค่าเพิ่มในส่วนลดนี้
 ConfirmClassifyPaidPartiallyReasonDiscountVat=ที่เหลือยังไม่ได้ชำระ <b>(% s% s)</b> เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ฉันกู้คืนภาษีมูลค่าเพิ่มส่วนลดนี้โดยไม่มีใบลดหนี้
 ConfirmClassifyPaidPartiallyReasonBadCustomer=ลูกค้าที่ไม่ดี
 ConfirmClassifyPaidPartiallyReasonProductReturned=ผลิตภัณฑ์กลับมาบางส่วน
 ConfirmClassifyPaidPartiallyReasonOther=จำนวนเงินที่ถูกทอดทิ้งด้วยเหตุผลอื่น ๆ
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=ทางเลือกนี้เป็นไปได้ถ้าใบแจ้งหนี้ของคุณได้รับการให้บริการที่มีความคิดเห็นที่เหมาะสม (ตัวอย่าง«เฉพาะภาษีที่สอดคล้องกับราคาที่ได้รับการชำระเงินจริงให้สิทธิในการหัก»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=ในบางประเทศทางเลือกนี้อาจเป็นไปได้เฉพาะในกรณีที่ใบแจ้งหนี้ของคุณมีบันทึกที่ถูกต้อง
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=ใช้ทางเลือกนี้ถ้าอื่น ๆ ไม่เหมาะกับ
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>ลูกค้าที่ร้ายก็คือลูกค้าที่ปฏิเสธที่จะจ่ายหนี้ของเขา</b>
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ทางเลือกนี้จะใช้เมื่อการชำระเงินที่ไม่สมบูรณ์เพราะบางส่วนของผลิตภัณฑ์ที่ถูกส่งกลับ
-ConfirmClassifyPaidPartiallyReasonOtherDesc=ใช้ทางเลือกนี้ถ้าอื่น ๆ ทั้งหมดไม่เหมาะเช่นในสถานการณ์ต่อไปนี้: <br> - การชำระเงินไม่สมบูรณ์เพราะผลิตภัณฑ์บางคนถูกส่งกลับ <br> - จำนวนเงินที่อ้างว่าสำคัญมากเกินไปเพราะส่วนลดที่ถูกลืม <br> ในทุกกรณีจำนวนเงินที่มากกว่าที่อ้างว่าจะต้องได้รับการแก้ไขในระบบบัญชีโดยการสร้างใบลดหนี้
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=อื่น ๆ
 ConfirmClassifyAbandonReasonOtherDesc=ทางเลือกนี้จะถูกนำมาใช้ในกรณีอื่น ๆ ตัวอย่างเช่นเพราะคุณวางแผนที่จะสร้างใบแจ้งหนี้แทน
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=ตรวจสอบใบแจ้งหนี้
 UnvalidateBill=ใบแจ้งหนี้ Unvalidate
-NumberOfBills=nb ของใบแจ้งหนี้
-NumberOfBillsByMonth=nb ของใบแจ้งหนี้เดือน
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=จำนวนเงินของใบแจ้งหนี้
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=จำนวนเงินของใบแจ้งหนี้ตามเดือน (สุทธิจากภาษี)
 ShowSocialContribution=แสดงทางสังคม / ภาษีการคลัง
 ShowBill=แสดงใบแจ้งหนี้
@@ -260,9 +262,9 @@ Repeatables=แม่แบบ
 ChangeIntoRepeatableInvoice=แปลงเป็นแม่แบบใบแจ้งหนี้
 CreateRepeatableInvoice=สร้างแม่แบบใบแจ้งหนี้
 CreateFromRepeatableInvoice=สร้างจากแม่แบบใบแจ้งหนี้
-CustomersInvoicesAndInvoiceLines=ใบแจ้งหนี้ของลูกค้าและเส้นใบแจ้งหนี้ของ
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=ใบแจ้งหนี้ของลูกค้าและการชำระเงิน
-ExportDataset_invoice_1=รายการใบแจ้งหนี้ของลูกค้าและเส้นใบแจ้งหนี้ของ
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=ใบแจ้งหนี้ของลูกค้าและการชำระเงิน
 ProformaBill=Proforma บิล:
 Reduction=การลดลง
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=ที่อยู่บิล
-HelpEscompte=ส่วนลดนี้จะได้รับส่วนลดพิเศษให้กับลูกค้าเนื่องจากการชำระเงินที่ถูกสร้างขึ้นมาก่อนวาระ
-HelpAbandonBadCustomer=เงินจำนวนนี้ถูกทิ้งร้าง (ลูกค้าบอกว่าจะเป็นลูกค้าที่ไม่ดี) และถือเป็นหลวมพิเศษ
-HelpAbandonOther=เงินจำนวนนี้ถูกทิ้งร้างเพราะมันเป็นข้อผิดพลาด (ลูกค้าที่ไม่ถูกต้องหรือใบแจ้งหนี้แทนที่ด้วยอื่น ๆ เป็นต้น)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=สังคม / รหัสชำระภาษีการคลัง
 PaymentId=รหัสการชำระเงิน
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=ใบแจ้งหนี้ไม่ได้เลือ
 CloneInvoice=ใบแจ้งหนี้โคลน
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=การดำเนินการปิดใช้งานเนื่องจากใบแจ้งหนี้ที่ได้รับการแทนที่
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=nb ของการชำระเงิน
+DescTaxAndDividendsArea=พื้นที่บริเวณนี้จะนำเสนอบทสรุปของการชำระเงินสำหรับค่าใช้จ่ายพิเศษ บันทึกเท่านั้นที่มีการชำระเงินในช่วงปีคงที่จะรวมอยู่ที่นี่
+NbOfPayments=No. of payments
 SplitDiscount=ส่วนลดในสองแยก
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=ปริมาณการป้อนข้อมูลสำหรับแต่ละสองส่วน
-TotalOfTwoDiscountMustEqualsOriginal=รวมของทั้งสองส่วนลดใหม่จะต้องเท่ากับจำนวนส่วนลดเดิม
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=ใบแจ้งหนี้ที่เกี่ยวข้อง
 RelatedBills=ใบแจ้งหนี้ที่เกี่ยวข้อง
 RelatedCustomerInvoices=ใบแจ้งหนี้ของลูกค้าที่เกี่ยวข้อง
 RelatedSupplierInvoices=ใบแจ้งหนี้ผู้จัดจำหน่ายที่เกี่ยวข้อง
 LatestRelatedBill=ใบแจ้งหนี้ที่เกี่ยวข้องล่าสุด
-WarningBillExist=คำเตือนหนึ่งหรือใบแจ้งหนี้มากขึ้นอยู่แล้ว
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=ผสานเครื่องมือรูปแบบไฟล์ PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=ตรวจสอบ
 PaymentTypeShortCHQ=ตรวจสอบ
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=ในการชำระเงินสาย
-PaymentTypeShortVAD=ในการชำระเงินสาย
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=ร่าง
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=ธนาคารรายละเอียด
 BankCode=รหัสธนาคาร
-DeskCode=รหัสโต๊ะ
+DeskCode=Office code
 BankAccountNumber=เลขที่บัญชี
-BankAccountNumberKey=สำคัญ
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN จำนวน
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / จำนวน SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=การชำระเงินโดยก
 VATIsNotUsedForInvoice=* ไม่รวมภาษีมูลค่าเพิ่มบังคับศิลปะ 293B ซีจี
 LawApplicationPart1=โดยการใช้กฎหมายของ 80.335 12/05/80
 LawApplicationPart2=สินค้าที่ยังคงเป็นทรัพย์สินของ
-LawApplicationPart3=ผู้ขายจนกว่า cashing สมบูรณ์ของ
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=ราคาของพวกเขา
 LimitedLiabilityCompanyCapital=SARL กับเมืองหลวงของ
 UseLine=ใช้
@@ -463,7 +465,7 @@ Cheques=การตรวจสอบ
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=ใช้ที่อยู่ติดต่อการเรียกเก็บเงินลูกค้าแทนการอยู่ของบุคคลที่สามในฐานะผู้รับใบแจ้งหนี้
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=แสดงใบแจ้งหนี้ที่ค้างชำระทั้งหมด
 ShowUnpaidLateOnly=แสดงใบแจ้งหนี้ที่ค้างชำระปลายเท่านั้น
 PaymentInvoiceRef=ใบแจ้งหนี้การชำระเงิน% s
@@ -474,21 +476,22 @@ Reported=ล่าช้า
 DisabledBecausePayments=เป็นไปไม่ได้เนื่องจากมีการชำระเงินบางส่วน
 CantRemovePaymentWithOneInvoicePaid=ไม่สามารถลบการชำระเงินเนื่องจากมีอย่างน้อยหนึ่งใบแจ้งหนี้แยกจ่าย
 ExpectedToPay=การชำระเงินที่คาดว่าจะ
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=การชำระเงินโดยการชำระเงินนี้
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=จำแนก "ชำระเงิน" ทั้งหมดบันทึกเครดิตการชำระเงินทั้งหมดกลับ
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=ใบแจ้งหนี้ทั้งหมดที่มียังคงไม่มีที่จะจ่ายจะปิดโดยอัตโนมัติเพื่อให้สถานะ "ชำระเงิน"
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=จ่ายเงิน
 ToMakePaymentBack=คืนทุน
 ListOfYourUnpaidInvoices=รายการของใบแจ้งหนี้ที่ค้างชำระ
 NoteListOfYourUnpaidInvoices=หมายเหตุ: รายการนี​​้จะมีใบแจ้งหนี้เฉพาะบุคคลที่สามคุณจะเชื่อมโยงกับการเป็นตัวแทนขาย
 RevenueStamp=อากรแสตมป์
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=ใบแจ้งหนี้แม่แบบ PDF Crabe แม่แบบใบแจ้งหนี้ฉบับสมบูรณ์ (แนะนำ Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=จำนวนกลับมาพร้อมกับรูปแบบ% syymm-nnnn สำหรับใบแจ้งหนี้และมาตรฐาน% syymm-nnnn สำหรับการบันทึกเครดิตที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 589abbb8085..782138c3542 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=แสดง บริษัท
 ShowStock=แสดงคลังสินค้า
 DeleteArticle=คลิกเพื่อลบบทความนี้
 FilterRefOrLabelOrBC=ค้นหา (Ref / ป้าย)
-UserNeedPermissionToEditStockToUsePos=คุณถามว่าจะลดลงหุ้นในการสร้างใบแจ้งหนี้เพื่อให้ผู้ใช้ที่ใช้ POS จำเป็นต้องได้รับอนุญาตให้แก้ไขหุ้น
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=จุดขาย
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index 9ac93e3d89f..bfebbc5692c 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=โทรศัพท์
 ActionAC_FAX=ส่งแฟ็กซ์
 ActionAC_PROP=ส่งข้อเสนอทางไปรษณีย์
 ActionAC_EMAIL=ส่งอีเมล์
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=การประชุม
 ActionAC_INT=การแทรกแซงในเว็บไซต์
 ActionAC_FAC=ส่งใบแจ้งหนี้ลูกค้าทางไปรษณีย์
@@ -72,8 +73,8 @@ StatusProsp=สถานะ Prospect
 DraftPropals=ข้อเสนอในเชิงพาณิชย์ร่าง
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/th_TH/dict.lang b/htdocs/langs/th_TH/dict.lang
index 34a2fe908ee..f264c019a8b 100644
--- a/htdocs/langs/th_TH/dict.lang
+++ b/htdocs/langs/th_TH/dict.lang
@@ -116,7 +116,7 @@ CountryHM=ได้ยินและเกาะ McDonald
 CountryVA=พระเห็น (นครรัฐวาติกัน)
 CountryHN=ฮอนดูรัส
 CountryHK=ฮ่องกง
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=อินเดีย
 CountryID=อินโดนีเซีย
 CountryIR=อิหร่าน
@@ -131,7 +131,7 @@ CountryKI=ประเทศคิริบาส
 CountryKP=เกาหลีเหนือ
 CountryKR=เกาหลีใต้
 CountryKW=คูเวต
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=ลาว
 CountryLV=ลัตเวีย
 CountryLB=ประเทศเลบานอน
@@ -160,7 +160,7 @@ CountryMD=มอลโดวา
 CountryMN=ประเทศมองโกเลีย
 CountryMS=Monserrat
 CountryMZ=โมซัมบิก
-CountryMM=Birmania (พม่า)
+CountryMM=Myanmar (Burma)
 CountryNA=นามิเบีย
 CountryNR=นาอูรู
 CountryNP=เนปาล
@@ -223,7 +223,7 @@ CountryTO=ตองกา
 CountryTT=ตรินิแดดและโตเบโก
 CountryTR=ตุรกี
 CountryTM=เติร์กเมนิสถาน
-CountryTC=เติกส์และหมู่เกาะ Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=ตูวาลู
 CountryUG=ยูกันดา
 CountryUA=ยูเครน
@@ -277,7 +277,7 @@ CurrencySingMGA=มาลากาซี
 CurrencyMUR=รูปีมอริเชียส
 CurrencySingMUR=รูปีมอริเชียส
 CurrencyNOK=นอร์เวย์ Krones
-CurrencySingNOK=โครนนอร์เวย์
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=ดินาร์ตูนิเซีย
 CurrencySingTND=ดีนาร์ตูนิเซีย
 CurrencyUSD=สกุลเงินดอลลาร์สหรัฐ
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=มุขบาฐ
 DemandReasonTypeSRC_PARTNER=หุ้นส่วน
 DemandReasonTypeSRC_EMPLOYEE=ลูกจ้าง
 DemandReasonTypeSRC_SPONSORING=การประกัน
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=รูปแบบ 4A0
 PaperFormatEU2A0=รูปแบบ 2A0
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index 42b0f14ca89..49c71627980 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=nb ของเอกสารในไดเรกทอรี
+ECMNbOfDocs=No. of documents in directory
 ECMSection=สารบบ
 ECMSectionManual=สมุดคู่มือ
 ECMSectionAuto=ไดเรกทอรีอัตโนมัติ
@@ -34,6 +34,8 @@ ECMDocsByProjects=เอกสารที่เชื่อมโยงกั
 ECMDocsByUsers=เอกสารที่เชื่อมโยงกับผู้ใช้งาน
 ECMDocsByInterventions=เอกสารที่เชื่อมโยงกับการแทรกแซง
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=ไดเรกทอรีไม่มีที่สร้างขึ้น
 ShowECMSection=ไดเรกทอรีแสดง
 DeleteSection=ลบไดเรกทอรี
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 423374a7636..b1b081a8290 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=ลูกค้า SOAP ล​​้มเหลว
 ErrorGlobalVariableUpdater5=ไม่มีตัวแปรทั่วโลกที่เลือก
 ErrorFieldMustBeANumeric=<b>s สนาม%</b> จะต้องเป็นค่าตัวเลข
 ErrorMandatoryParametersNotProvided=พารามิเตอร์บังคับ (s) ไม่ได้ให้
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=พารามิเตอร์การตั้งค่าบังคับไม่ได้กำหนดไว้ยัง
diff --git a/htdocs/langs/th_TH/help.lang b/htdocs/langs/th_TH/help.lang
index 2b1d5f0a32d..5dfcf36e154 100644
--- a/htdocs/langs/th_TH/help.lang
+++ b/htdocs/langs/th_TH/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=ออนไลน์เรียลไทม์ / สน
 OtherSupport=การสนับสนุนอื่น ๆ
 ToSeeListOfAvailableRessources=หากต้องการติดต่อ / ดูทรัพยากรที่มีอยู่:
 HelpCenter=ศูนย์ช่วยเหลือ
-DolibarrHelpCenter=ช่วยเหลือ Dolibarr และศูนย์การสนับสนุน
-ToGoBackToDolibarr=หรือคลิก <a href="%s">ที่นี่เพื่อใช้ Dolibarr</a>
-TypeOfSupport=แหล่งที่มาของการสนับสนุน
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=ชุมชน (ฟรี)
 TypeSupportCommercial=เชิงพาณิชย์
 TypeOfHelp=ชนิด
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=ประสิทธิภาพ
 TypeHelpOnly=ช่วยเหลือเท่านั้น
 TypeHelpDev=ความช่วยเหลือ + พัฒนา
-TypeHelpDevForm=ความช่วยเหลือ + + การพัฒนาสร้าง
-ToGetHelpGoOnSparkAngels1=บาง บริษัท สามารถให้บริการได้อย่างรวดเร็ว (บางครั้งทันที) และมีประสิทธิภาพมากขึ้นการสนับสนุนทางออนไลน์โดยการควบคุมของเครื่องคอมพิวเตอร์ของคุณ <b>ช่วยเหลือดังกล่าวสามารถพบได้บน% s</b> เว็บไซต์:
-ToGetHelpGoOnSparkAngels3=นอกจากนี้คุณยังสามารถไปที่รายชื่อของโค้ชที่มีอยู่ทั้งหมดสำหรับ Dolibarr สำหรับนี้คลิกที่ปุ่ม
-ToGetHelpGoOnSparkAngels2=บางครั้งไม่มี บริษัท ที่มีอยู่ในช่วงเวลาที่คุณให้การค้นหาของคุณจึงคิดที่จะเปลี่ยนแปลงตัวกรองที่จะมองหา "ทั้งหมดพร้อมใช้งาน" คุณจะสามารถที่จะส่งคำขอเพิ่มเติม
-BackToHelpCenter=หรือคลิกที่นี่เพื่อไป <a href="%s">กลับไปช่วยหน้าบ้านศูนย์</a>
-LinkToGoldMember=คุณสามารถเรียกหนึ่งในโค้ชไว้ล่วงหน้าโดย Dolibarr สำหรับภาษาของคุณ (% s) โดยคลิกที่เครื่องมือของเขา (สถานะและราคาสูงสุดที่มีการปรับปรุงโดยอัตโนมัติ):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=ภาษาที่รองรับ
-SubscribeToFoundation=ช่วยเหลือโครงการ Dolibarr สมัครให้กับมูลนิธิ
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=สำหรับการสนับสนุนอย่างเป็นทางการ Dolibarr ในภาษาของคุณ: <br> <a href="%s" target="_blank"><b>% s</b></a>
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index c4e68de470b..b46071244b8 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=ระบบบริหารจัดการทรัพยากรบุคคล
-Holidays=ใบลา
-CPTitreMenu=ใบลา
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=คำสั่งรายเดือน
 MenuAddCP=คำขอลาใหม่
-NotActiveModCP=คุณต้องเปิดใบโมดูลเพื่อดูหน้านี้
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=ขอลา
 DateDebCP=วันที่เริ่มต้น
 DateFinCP=วันที่สิ้นสุด
@@ -15,13 +15,18 @@ ApprovedCP=ได้รับการอนุมัติ
 CancelCP=ยกเลิก
 RefuseCP=ปฏิเสธ
 ValidatorCP=Approbator
-ListeCP=รายการของใบ
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=ลักษณะ
 SendRequestCP=สร้างการร้องขอลา
 DelayToRequestCP=<b>ออกจากการร้องขอจะต้องทำอย่างน้อย% s วัน (s)</b> ก่อนหน้าพวกเขา
-MenuConfCP=Balance of leaves
-SoldeCPUser=<b>สมดุลใบเป็น% s</b> วัน
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=คุณต้องเลือกวันที่สิ้นสุดมากกว่าวันที่เริ่มต้น
 ErrorSQLCreateCP=ข้อผิดพลาดที่เกิดขึ้นในช่วง SQL สร้าง:
 ErrorIDFicheCP=เกิดข้อผิดพลาดขอลาไม่อยู่
@@ -30,7 +35,14 @@ ErrorUserViewCP=คุณยังไม่ได้รับอนุญาต
 InfosWorkflowCP=ข้อมูลเวิร์กโฟลว์
 RequestByCP=การร้องขอจาก
 TitreRequestCP=คำขอฝาก
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=จำนวนวันของวันหยุดบริโภค
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=แก้ไข
 DeleteCP=ลบ
 ActionRefuseCP=ปฏิเสธ
@@ -59,6 +71,7 @@ DateRefusCP=วันที่ของการปฏิเสธ
 DateCancelCP=วันที่มีการยกเลิก
 DefineEventUserCP=กำหนดลาพิเศษสำหรับผู้ใช้
 addEventToUserCP=กำหนดออกจาก
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=เหตุผล
 UserCP=ผู้ใช้งาน
 ErrorAddEventToUserCP=เกิดข้อผิดพลาดในขณะที่เพิ่มการลาพิเศษ
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=ปรับปรุงเรียบร้อยแล้ว
 Module27130Name= การบริหารจัดการของการร้องขอลา
 Module27130Desc= การบริหารจัดการของการร้องขอลา
@@ -94,7 +112,7 @@ NoticePeriod=ระยะเวลาการแจ้งให้ทราบ
 HolidaysToValidate=ตรวจสอบการร้องขอลา
 HolidaysToValidateBody=ด้านล่างคำขอลาในการตรวจสอบคือ
 HolidaysToValidateDelay=คำขอลานี้จะเกิดขึ้นภายในระยะเวลาน้อยกว่า% s วัน
-HolidaysToValidateAlertSolde=ผู้ใช้ที่ทำนี้ออกจากข้อความร้องขอไม่ได้มีวันที่เพียงพอ
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=การตรวจสอบการร้องขอลา
 HolidaysValidatedBody=คำขอลาสำหรับ% s% s ได้รับการตรวจสอบ
 HolidaysRefused=ขอปฏิเสธ
@@ -103,4 +121,9 @@ HolidaysCanceled=ยกเลิกคำขอใบ
 HolidaysCanceledBody=คำขอลาสำหรับ% s% s ได้ถูกยกเลิก
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=<strong>ไปลงในหน้าหลัก - การติดตั้ง - พจนานุกรม - ประเภทของใบจะติดตั้งที่แตกต่างกันของใบ</strong>
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index c6998307258..e63edb4c09c 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=เพียงทำตามคำแนะนำทีละขั้นตอน
 MiscellaneousChecks=สิ่งที่ต้องมีการตรวจสอบ
 ConfFileExists=<b>การกำหนดค่าไฟล์% s</b> อยู่
-ConfFileDoesNotExistsAndCouldNotBeCreated=<b>การกำหนดค่าไฟล์% s</b> ไม่ได้อยู่และไม่สามารถสร้าง!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=<b>การกำหนดค่าไฟล์% s</b> จะถูกสร้างขึ้น
-ConfFileIsNotWritable=<b>การกำหนดค่าไฟล์% s</b> ไม่สามารถเขียนได้ สิทธิ์ในการตรวจสอบ สำหรับการติดตั้งครั้งแรกเว็บเซิร์ฟเวอร์ของคุณต้องได้รับเพื่อให้สามารถเขียนลงในไฟล์นี้ในระหว่างขั้นตอนการตั้งค่า ("chmod 666" ตัวอย่างเช่นในระบบปฏิบัติการยูนิกซ์เช่น OS)
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=<b>การกำหนดค่าไฟล์% s</b> เขียนได้
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=โหลดข้อมูลจากแฟ้มการกำหนดค่า
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP นี้สนับสนุนการประชุม
 PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
-PHPSupportPOSTGETKo=มันเป็นไปได้ที่การตั้งค่า PHP ของคุณไม่สนับสนุนตัวแปร POST และ / หรือได้รับ ตรวจสอบ <b>variables_order</b> พารามิเตอร์ใน php.ini
-PHPSupportGD=การสนับสนุนนี้ PHP GD ฟังก์ชั่นกราฟิก
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=นี้สนับสนุน PHP ฟังก์ชั่ UTF8
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง%</b> s นี้ควรจะเพียงพอ
-PHPMemoryTooLow=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง% s</b> ไบต์ นี้ควรจะต่ำเกินไป เปลี่ยน <b>php.ini</b> ของคุณเพื่อตั้งค่าพารามิเตอร์ <b>memory_limit อย่างน้อย% s</b> ไบต์
-Recheck=คลิกที่นี่เพื่อทดสอบเพิ่มเติม significative
-ErrorPHPDoesNotSupportSessions=การติดตั้ง PHP ของคุณไม่สนับสนุนการประชุม คุณลักษณะนี้เป็นสิ่งจำเป็นที่จะทำให้การทำงาน Dolibarr ตรวจสอบการติดตั้ง PHP ของคุณ
-ErrorPHPDoesNotSupportGD=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่นกราฟิก GD กราฟจะไม่สามารถใช้ได้
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่น UTF8 Dolibarr ไม่สามารถทำงานได้อย่างถูกต้อง แก้ปัญหานี้ก่อนการติดตั้ง Dolibarr
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=สารบบ% s ไม่ได้อยู่
-ErrorGoBackAndCorrectParameters=ย้อนกลับไปและแก้ไขพารามิเตอร์ที่ไม่ถูกต้อง
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=คุณอาจจะพิมพ์ค่าที่ไม่ถูกต้องสำหรับพารามิเตอร์ '% s'
 ErrorFailedToCreateDatabase=ไม่สามารถสร้างฐานข้อมูล '% s'
 ErrorFailedToConnectToDatabase=ไม่สามารถเชื่อมต่อกับฐานข้อมูล '% s'
 ErrorDatabaseVersionTooLow=รุ่นฐานข้อมูล (% s) เก่าเกินไป รุ่น s% หรือสูงกว่าที่จำเป็น
 ErrorPHPVersionTooLow=PHP รุ่นเก่าเกินไป % s รุ่นจะต้อง
-ErrorConnectedButDatabaseNotFound=เชื่อมต่อกับเซิร์ฟเวอร์ที่ประสบความสำเร็จ แต่ฐานข้อมูล '% s' ไม่พบ
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=ฐานข้อมูล '% s' อยู่แล้ว
-IfDatabaseNotExistsGoBackAndUncheckCreate=ถ้าฐานข้อมูลที่มีอยู่ไม่ได้กลับไปและตรวจสอบตัวเลือก "สร้างฐานข้อมูล"
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=ถ้าฐานข้อมูลที่มีอยู่แล้วให้กลับไปและยกเลิก "สร้างฐานข้อมูลตัวเลือก"
-WarningBrowserTooOld=รุ่นเก่าเกินไปของเบราว์เซอร์ เบราว์เซอร์ของคุณอัพเกรดเป็นรุ่นล่าสุดของ Firefox, Chrome หรือ Opera เป็น recommanded สูง
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP รุ่น
 License=ใช้ใบอนุญาต
 ConfigurationFile=แฟ้มการกำหนดค่า
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr ฐานข้อมูล
 DatabaseType=ชนิดของฐานข้อมูล
 DriverType=ชนิดตัวขับ
 Server=เซิร์ฟเวอร์
-ServerAddressDescription=ชื่อหรือที่อยู่ IP สำหรับเซิร์ฟเวอร์ฐานข้อมูลมักจะ 'localhost' เมื่อเซิร์ฟเวอร์ฐานข้อมูลโฮสต์บนเซิร์ฟเวอร์เดียวกันกว่าเว็บเซิร์ฟเวอร์
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=ฐานข้อมูลเซิร์ฟเวอร์พอร์ต ให้ว่างเปล่าถ้าไม่รู้จัก
 DatabaseServer=เซิร์ฟเวอร์ฐานข้อมูล
 DatabaseName=ชื่อฐานข้อมูล
-DatabasePrefix=ฐานข้อมูลตารางคำนำหน้า
-AdminLogin=เข้าสู่ระบบฐานข้อมูลสำหรับเจ้าของ Dolibarr
-PasswordAgain=พิมพ์รหัสผ่านเป็นครั้งที่สอง
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=รหัสผ่านสำหรับเจ้าของฐานข้อมูล Dolibarr
 CreateDatabase=สร้างฐานข้อมูล
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=เซิร์ฟเวอร์ฐานข้อมูล - การเข้าถึง Superuser
-CheckToCreateDatabase=กล่องตรวจสอบว่าฐานข้อมูลไม่ได้อยู่และจะต้องสร้างขึ้น <br> ในกรณีนี้คุณต้องกรอกข้อมูลเข้าสู่ระบบ / รหัสผ่านสำหรับบัญชี superuser ที่ด้านล่างของหน้านี้
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=เข้าสู่ระบบของผู้ใช้ที่ได้รับอนุญาตในการสร้างฐานข้อมูลใหม่หรือผู้ใช้ใหม่บังคับถ้าฐานข้อมูลหรือเจ้าของของคุณไม่ได้อยู่แล้ว
-KeepEmptyIfNoPassword=ปล่อยว่างไว้ถ้าผู้ใช้มีรหัสผ่านไม่ (หลีกเลี่ยงปัญหานี้)
-SaveConfigurationFile=ประหยัดค่า
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=การเชื่อมต่อเซิร์ฟเวอร์
 DatabaseCreation=การสร้างฐานข้อมูล
 CreateDatabaseObjects=ฐานข้อมูลการสร้างวัตถุ
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=สร้างปุ่มต่างประเท
 OtherKeysCreation=คีย์ต่างประเทศและการสร้างดัชนี
 FunctionsCreation=ฟังก์ชั่นการสร้าง
 AdminAccountCreation=ผู้ดูแลระบบเข้าสู่ระบบการสร้าง
-PleaseTypePassword=กรุณาพิมพ์รหัสผ่านรห​​ัสผ่านที่ว่างเปล่าไม่ได้รับอนุญาต!
-PleaseTypeALogin=กรุณาพิมพ์เข้าสู่ระบบ!
-PasswordsMismatch=รหัสผ่านที่แตกต่างโปรดลองอีกครั้ง!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=ในตอนท้ายของการตั้งค่า
 SystemIsInstalled=การติดตั้งนี้เสร็จสมบูรณ์
 SystemIsUpgraded=Dolibarr ได้รับการอัพเกรดที่ประสบความสำเร็จ
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=คุณต้องกำหนดค่า Dolibarr
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=ไปที่ Dolibarr
 GoToSetupArea=ไปที่ Dolibarr (พื้นที่ติดตั้ง)
-MigrationNotFinished=รุ่นของฐานข้อมูลของคุณไม่สมบูรณ์ถึงวันดังนั้นคุณจะต้องใช้กระบวนการปรับรุ่นอีกครั้ง
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=ไปที่หน้าอัพเกรดอีกครั้ง
 WithNoSlashAtTheEnd=โดยไม่ต้องเฉือน "/" ในตอนท้าย
-DirectoryRecommendation=มันเป็น recommanded ใช้ไดเรกทอรีนอกไดเรกทอรีของคุณหน้าเว็บของคุณ
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=ที่มีอยู่แล้ว
 DolibarrAdminLogin=ผู้ดูแลระบบเข้าสู่ระบบ Dolibarr
-AdminLoginAlreadyExists=Dolibarr บัญชีผู้ดูแลระบบ <b>'% s'</b> อยู่แล้ว กลับไปถ้าคุณต้องการที่จะสร้างอีกคนหนึ่ง
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=คำเตือนเพื่อความปลอดภัยเมื่อติดตั้งหรืออัพเกรดเสร็จสมบูรณ์หลีกเลี่ยงการใช้ติดตั้งเครื่องมืออีกครั้งคุณควรเพิ่มไฟล์ที่เรียกว่า <b>install.lock</b> ลงในไดเรกทอรีเอกสาร Dolibarr เพื่อที่จะหลีกเลี่ยงการใช้ที่เป็นอันตรายของมัน
-FunctionNotAvailableInThisPHP=ไม่สามารถใช้ได้ใน PHP นี้
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=เลือกสคริปต์การย้ายถิ่น
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=การประมวลผลสคริปต์
 ChooseYourSetupMode=เลือกโหมดการตั้งค่าของคุณและคลิกที่ "เริ่มต้น" ...
 FreshInstall=ติดตั้งใหม่
-FreshInstallDesc=ใช้โหมดนี้ถ้านี้เป็นครั้งแรกของคุณติดตั้ง ถ้าไม่ได้โหมดนี้สามารถซ่อมแซมติดตั้งก่อนหน้านี้ไม่สมบูรณ์ แต่ถ้าคุณต้องการที่จะปรับรุ่นของคุณเลือก "การอัพเกรดโหมด"
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=อัพเกรด
 UpgradeDesc=ใช้โหมดนี้ถ้าคุณได้เปลี่ยนไฟล์ Dolibarr กับไฟล์จากเวอร์ชันที่ใหม่กว่า นี้จะอัพเกรดฐานข้อมูลและข้อมูลของคุณ
 Start=เริ่มต้น
 InstallNotAllowed=ติดตั้งไม่ได้รับอนุญาตตามสิทธิ์ <b>conf.php</b>
 YouMustCreateWithPermission=คุณต้องสร้างแฟ้ม% s และกำหนดสิทธิ์ในการเขียนเกี่ยวกับมันสำหรับเว็บเซิร์ฟเวอร์ในระหว่างขั้นตอนการติดตั้ง
-CorrectProblemAndReloadPage=โปรดแก้ไขปัญหาและกด F5 เพื่อโหลดหน้าเว็บ
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=อพยพแล้ว
 DatabaseVersion=รุ่นฐานข้อมูล
 ServerVersion=เซิร์ฟเวอร์ฐานข้อมูลรุ่น
 YouMustCreateItAndAllowServerToWrite=คุณต้องสร้างไดเรกทอรีนี้และอนุญาตให้เว็บเซิร์ฟเวอร์ที่จะเขียนลงไป
 DBSortingCollation=เรียงลำดับตัวอักษร
-YouAskDatabaseCreationSoDolibarrNeedToConnect=<b>คุณถามในการสร้างฐานข้อมูล%</b> แต่สำหรับเรื่องนี้ Dolibarr <b>จำเป็นต้องเชื่อมต่อกับเซิร์ฟเวอร์% s</b> ด้วยสิทธิ์ผู้ใช้ <b>super% s</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=<b>คุณถามเพื่อสร้างฐานข้อมูลเข้าสู่ระบบ%</b> แต่สำหรับเรื่องนี้ Dolibarr <b>จำเป็นต้องเชื่อมต่อกับเซิร์ฟเวอร์% s</b> ด้วยสิทธิ์ผู้ใช้ <b>super% s</b>
-BecauseConnectionFailedParametersMayBeWrong=ขณะที่การเชื่อมต่อล้มเหลวโฮสต์หรือพารามิเตอร์ผู้ใช้ super ต้องผิด
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=การชำระเงินเด็กกำพร้าที่ตรวจพบโดยวิธี% s
 RemoveItManuallyAndPressF5ToContinue=ลบออกด้วยตนเองและกด F5 เพื่อดำเนินการต่อไป
 FieldRenamed=เปลี่ยนชื่อสนาม
-IfLoginDoesNotExistsCheckCreateUser=หากเข้าสู่ระบบไม่ได้มีอยู่ แต่คุณต้องตรวจสอบตัวเลือก "สร้างผู้ใช้"
-ErrorConnection=เซิร์ฟเวอร์ <b>"% s"</b> ชื่อฐานข้อมูล <b>"% s"</b> เข้าสู่ระบบ <b>"% s"</b> หรือรหัสผ่านฐานข้อมูลอาจจะผิดหรือ PHP รุ่นลูกค้าอาจจะเก่าเกินไปเมื่อเทียบกับเวอร์ชันของฐานข้อมูล
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=<b>ทางเลือกที่แนะนำในการติดตั้งเวอร์ชั่น% s จากรุ่นปัจจุบันของคุณ% s</b>
 InstallChoiceSuggested=<b>ติดตั้งทางเลือกที่แนะนำโดยการติดตั้ง</b>
-MigrateIsDoneStepByStep=รุ่นที่มีการกำหนดเป้​​าหมาย (% s) มีช่องว่างของหลายรุ่นเพื่อให้การติดตั้งตัวช่วยสร้างจะกลับมาเพื่อแสดงให้เห็นการโยกย้ายครั้งเดียวต่อไปนี้จะแล้วเสร็จ
-CheckThatDatabasenameIsCorrect=ตรวจสอบชื่อของฐานข้อมูลที่ <b>"% s"</b> ถูกต้อง
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=ถ้าชื่อนี้ถูกต้องและฐานข้อมูลที่ยังไม่ปรากฏอยู่คุณต้องตรวจสอบตัวเลือก "สร้างฐานข้อมูล"
 OpenBaseDir=PHP openbasedir พารามิเตอร์
-YouAskToCreateDatabaseSoRootRequired=คุณตรวจสอบกล่อง "สร้างฐานข้อมูล" สำหรับนี้คุณจำเป็นต้องให้เข้าสู่ระบบ / รหัสผ่านของ superuser (ด้านล่างของรูปแบบ)
-YouAskToCreateDatabaseUserSoRootRequired=คุณตรวจสอบกล่อง "สร้างเจ้าของฐานข้อมูล" สำหรับนี้คุณจำเป็นต้องให้เข้าสู่ระบบ / รหัสผ่านของ superuser (ด้านล่างของรูปแบบ)
-NextStepMightLastALongTime=ขั้นตอนปัจจุบันอาจนานหลายนาที กรุณารอสักครู่จนกระทั่งหน้าจอต่อไปคือการแสดงให้เห็นก่อนที่จะดำเนินการต่อไป
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=โยกย้ายการจัดส่งสินค้าให้กับลูกค้าจัดเก็บข้อมูลการสั่งซื้อ
 MigrationShippingDelivery=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง
 MigrationShippingDelivery2=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง 2
 MigrationFinished=การโยกย้ายเสร็จ
-LastStepDesc=<strong>ขั้นตอนสุดท้าย:</strong> กำหนดเข้าสู่ระบบที่นี่และรหัสผ่านที่คุณวางแผนที่จะใช้ในการเชื่อมต่อกับซอฟแวร์ ไม่หลวมนี้มันเป็นบัญ​​ชีที่จะดูแลคนอื่น ๆ ทั้งหมด
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=เปิดใช้งานโมดูล% s
 ShowEditTechnicalParameters=คลิกที่นี่เพื่อแสดง / แก้ไขพารามิเตอร์ขั้นสูง (โหมดผู้เชี่ยวชาญ)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=รุ่นฐานข้อมูลของคุณ% s แต่ก็มีข้อผิดพลาดที่สำคัญทำให้การสูญเสียข้อมูลถ้าคุณทำการเปลี่ยนแปลงโครงสร้างฐานข้อมูลของคุณเหมือนว่ามันจะถูกต้องตามกระบวนการโยกย้าย ด้วยเหตุผลของการย้ายถิ่นจะไม่ได้รับอนุญาตจนกว่าคุณจะอัพเกรดฐานข้อมูลของคุณไปเป็นรุ่นที่คงที่ที่สูงขึ้น (รายชื่อที่รู้จักกันร้องรุ่น:% s)
-KeepDefaultValuesWamp=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จาก DoliWamp ดังนั้นค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เปลี่ยนพวกเขาเท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
-KeepDefaultValuesDeb=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จากแพคเกจลินุกซ์ (Ubuntu, Debian, Fedora ... ) ดังนั้นค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เฉพาะรหัสผ่านของเจ้าของฐานข้อมูลเพื่อสร้างจะต้องเสร็จสิ้น เปลี่ยนพารามิเตอร์อื่น ๆ เท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
-KeepDefaultValuesMamp=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จาก DoliMamp ดังนั้นค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เปลี่ยนพวกเขาเท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
-KeepDefaultValuesProxmox=คุณสามารถใช้ตัวช่วยสร้างการติดตั้ง Dolibarr จาก Proxmox เสมือนเครื่องเพื่อให้ค่าที่นำเสนอในที่นี้จะดีที่สุดแล้ว เปลี่ยนพวกเขาเท่านั้นถ้าคุณรู้ว่าสิ่งที่คุณทำ
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=การโยกย้ายข้อมูลสำหรับข้อเสนอในเชิงพาณิชย์
 MigrationInvoice=การโยกย้ายข้อมูลสำหรับใบแจ้งหนี้ของลูกค้า
 MigrationContract=การโยกย้ายข้อมูลในการทำสัญญา
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=การปรับรุ่นที่ประสบความสำเร็จ
 MigrationUpdateFailed=การอัพเกรดล้มเหลว
 MigrationRelationshipTables=การโยกย้ายข้อมูลสำหรับตารางความสัมพันธ์ (% s)
 MigrationPaymentsUpdate=แก้ไขข้อมูลการชำระเงิน
@@ -163,9 +164,9 @@ MigrationContractsUpdate=สัญญาแก้ไขข้อมูล
 MigrationContractsNumberToUpdate=สัญญา% s (s) เพื่อปรับปรุง
 MigrationContractsLineCreation=สร้างสายสัญญาสำหรับการอ้างอิงสัญญา% s
 MigrationContractsNothingToUpdate=ไม่มีสิ่งที่ต้องทำ
-MigrationContractsFieldDontExist=fk_facture สนามไม่อยู่อีกต่อไป ไม่มีอะไรที่จะทำ
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=การแก้ไขสัญญาวันที่ว่างเปล่า
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=ไม่มีวันที่ทำสัญญาที่ว่างเปล่าที่จะแก้ไข
 MigrationContractsEmptyCreationDatesNothingToUpdate=วันที่สร้างสัญญายังไม่ได้แก้ไข
 MigrationContractsInvalidDatesUpdate=วันที่คิดมูลค่าการแก้ไขสัญญาที่ไม่ดี
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=การปรับปรุงการจัดส
 MigrationStockDetail=อัพเดตค่าหุ้นของผลิตภัณฑ์
 MigrationMenusDetail=ปรับปรุงตารางเมนูแบบไดนามิก
 MigrationDeliveryAddress=ที่อยู่จัดส่งการปรับปรุงในการจัดส่ง
-MigrationProjectTaskActors=การโยกย้ายข้อมูลสำหรับตาราง llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=เขตการโยกย้ายข้อมูล fk_user_resp ของ llx_projet เพื่อ llx_element_contact
 MigrationProjectTaskTime=เวลาการปรับปรุงการใช้จ่ายในไม่กี่วินาที
 MigrationActioncommElement=ปรับปรุงข้อมูลเกี่ยวกับการกระทำ
 MigrationPaymentMode=การโยกย้ายข้อมูลสำหรับโหมดการชำระเงิน
 MigrationCategorieAssociation=การย้ายถิ่นของประเภท
-MigrationEvents=การย้ายถิ่นของเหตุการณ์ที่จะเพิ่มเจ้าของเหตุการณ์ลงในตาราง assignement
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=แสดงตัวเลือกที่มีอยู่ไม่ได้
-HideNotAvailableOptions=ซ่อนตัวเลือกที่มีอยู่ไม่ได้
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 60638ebcb67..d2152034bd4 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=สำหรับรายชื่อของบุคค
 ContactsAddressesForCompany=รายชื่อ / ที่อยู่สำหรับบุคคลที่สามนี้
 AddressesForCompany=สำหรับที่อยู่ของบุคคลที่สามนี้
 ActionsOnCompany=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับบุคคลที่สามนี้
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับสมาชิกในนี้
 ActionsOnProduct=Events about this product
 NActionsLate=% s ปลาย
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=รายงานค่าใช้จ่าย
 ExpenseReports=รายงานค่าใช้จ่าย
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 899dfc0c067..f2ff406f446 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -83,6 +83,7 @@ LinkedObject=วัตถุที่เชื่อมโยง
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=ชื่อเรื่อง
 WEBSITE_DESCRIPTION=ลักษณะ
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/th_TH/paybox.lang b/htdocs/langs/th_TH/paybox.lang
index c7ee1c0d3ad..3c36ccf09b3 100644
--- a/htdocs/langs/th_TH/paybox.lang
+++ b/htdocs/langs/th_TH/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox ติดตั้งโมดูล
 PayBoxDesc=หน้าเสนอโมดูลนี้จะอนุญาตให้มีการชำระเงินใน <a href="http://www.paybox.com" target="_blank">Paybox</a> จากลูกค้า นี้สามารถใช้สำหรับการชำระเงินฟรีหรือการชำระเงินบนวัตถุโดยเฉพาะอย่างยิ่ง Dolibarr (ใบแจ้งหนี้การสั่งซื้อ ... )
 FollowingUrlAreAvailableToMakePayments=URL ต่อไปนี้จะพร้อมที่จะให้หน้าให้กับลูกค้าที่จะทำให้การชำระเงินบนวัตถุ Dolibarr
 PaymentForm=รูปแบบการชำระเงิน
-WelcomeOnPaymentPage=ยินดีต้อนรับในการให้บริการการชำระเงินออนไลน์ของเรา
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=หน้าจอนี้จะช่วยให้คุณสามารถชำระเงินออนไลน์ไปยัง% s
 ThisIsInformationOnPayment=นี้เป็นข้อมูลเกี่ยวกับการชำระเงินที่จะทำ
 ToComplete=ให้เสร็จสมบูรณ์
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL ที่จะนำเสนอส
 ToOfferALinkForOnlinePaymentOnContractLine=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับสายสัญญา
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์ s% สำหรับจำนวนเงินที่ฟรี
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL ที่จะนำเสนอส่วนติดต่อผู้ใช้การชำระเงินออนไลน์% s สำหรับการสมัครสมาชิก
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=นอกจากนี้คุณยังสามารถเพิ่มพารามิเตอร์ URL <b>และแท็ก = <i>ค่าใด</i></b> ๆ ของ URL เหล่านั้น (ที่จำเป็นเท่านั้นสำหรับการชำระเงินฟรี) เพื่อเพิ่มแท็กความคิดเห็นการชำระเงินของคุณเอง
-SetupPayBoxToHavePaymentCreatedAutomatically=ติดตั้ง PayBox <b>ของคุณด้วยสมาชิก% s</b> จะมีการชำระเงินที่สร้างขึ้นโดยอัตโนมัติเมื่อมีการตรวจสอบโดย paybox
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=หน้านี้ยืนยันว่าชำระเงินของคุณได้รับการบันทึก ขอบคุณ
-YourPaymentHasNotBeenRecorded=ชำระเงินที่คุณยังไม่ได้รับการบันทึกไว้และได้รับการยกเลิกการทำธุรกรรม ขอบคุณ
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=พารามิเตอร์บัญชี
 UsageParameter=พารามิเตอร์การใช้งาน
 InformationToFindParameters=ช่วยในการหาข้อมูลเกี่ยวกับบัญชีของคุณ s%
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index c4ae988632c..4cbd7a4f08f 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=ลงนาม (ความต้องการของ
 PropalStatusNotSigned=ไม่ได้ลงชื่อ (ปิด)
 PropalStatusBilled=การเรียกเก็บเงิน
 PropalStatusDraftShort=ร่าง
-PropalStatusValidatedShort=ผ่านการตรวจสอบ
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=ปิด
 PropalStatusSignedShort=ลงนาม
 PropalStatusNotSignedShort=ไม่ได้ลงนาม
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal% s ไม่พบ
 AddToDraftProposals=เพิ่มลงในร่างข้อเสนอ
 NoDraftProposals=ไม่มีร่างข้อเสนอ
 CopyPropalFrom=สร้างข้อเสนอในเชิงพาณิชย์โดยการคัดลอกข้อเสนอที่มีอยู่
-CreateEmptyPropal=สร้างข้อเสนอในเชิงพาณิชย์ว่าง Vierge หรือจากรายการของผลิตภัณฑ์ / บริการ
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=ระยะเวลาเริ่มต้นความถูกต้องข้อเสนอในเชิงพาณิชย์ (ในวัน)
-UseCustomerContactAsPropalRecipientIfExist=ใช้ที่อยู่การติดต่อกับลูกค้าถ้ากำหนดไว้แทนการที่อยู่ของบุคคลที่สามเป็นที่อยู่ของผู้รับข้อเสนอ
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=ข้อเสนอในเชิงพาณิชย์โคลน
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=การติดต่อกับลู
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=รูปแบบข้อเสนอฉบับสมบูรณ์ (โลโก้ ... )
+DocModelCyanDescription=รูปแบบข้อเสนอฉบับสมบูรณ์ (โลโก้ ... )
 DefaultModelPropalCreate=เริ่มต้นการสร้างแบบจำลอง
 DefaultModelPropalToBill=แม่แบบเริ่มต้นเมื่อปิดข้อเสนอทางธุรกิจ (ที่จะออกใบแจ้งหนี้)
 DefaultModelPropalClosed=แม่แบบเริ่มต้นเมื่อปิดข้อเสนอทางธุรกิจ (ยังไม่เรียกเก็บ)
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 84689754fdd..e2d2360c13c 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=รหัส
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=อ่าน
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index e013bed99bd..16531ed9625 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Özellik demoda devre dışıdır
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Dış uygulama/modül bul
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Çoklu-Modül araçları
 ModuleFamilyExperimental=Deneysel modüller
 ModuleFamilyFinancial=Mali Modüller (Muhasebe/Hazine)
 ModuleFamilyECM=Elektronik İçerik Yönetimi (ECM)
-ModuleFamilyPortal=Web siteleri ve diğer ön uygulama
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Dış sistemli arayüzler
 MenuHandlers=Menü işlemcileri
 MenuAdmin=Menü düzenleyici
@@ -463,9 +463,9 @@ ClickToShowDescription=Açıklamayı görmek için tıkla
 DependsOn=This module needs the module(s)
 RequiredBy=Bu modül, modül (ler) için zorunludur
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Kişiselleştirilmiş varsayılan değerlerin kullanımını etkinleştir
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Kullanıcılar ve Gruplar
 Module0Desc=Kullanıcı / Çalışan ve Grup Yönetimi
 Module1Name=Üçüncü Partiler
-Module1Desc=Firma ve kişi yönetimi (müşteriler, adaylar…)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Ticaret
 Module2Desc=Ticaret yönetimi
 Module10Name=Muhasebe
@@ -501,7 +501,7 @@ Module23Desc=Enerji tüketimlerinin izlenmesi
 Module25Name=Müşteri Siparişleri
 Module25Desc=Müşteri siparişleri yönetimi
 Module30Name=Faturalar
-Module30Desc=Müşteri faturaları ve iade faturaları yönetimi. Tedarikçi fatura yönetimi
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Tedarikçiler
 Module40Desc=Tedarikçi ve satın alma yönetimi (satın alma siparişleri ve faturalandırma)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Ödeme koşulları
 DictionaryPaymentModes=Ödeme türleri
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Kağıt biçimleri
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Yerel Vergi raporları satışların yerel vergileri toplamıd
 LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket
 LabelOnDocuments=Belgeler üzerindeki etiket
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Ay sonunda
 CurrentNext=Güncel/Sonraki
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Güvenlik denetimi etkinlikleri
-Audit=Denetim
+Audit=Security events
 InfoDolibarr=Dolibarr Bilgileri
 InfoBrowser=Tarayıcı Bilgileri
 InfoOS=OS Bilgileri
@@ -1065,7 +1066,7 @@ BrowserName=Tarayıcı adı
 BrowserOS=Tarayıcı OS
 ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
 SecurityEventsPurged=Güvenlik etkinlikleri temizlendi
-LogEventDesc=Burada Dolibarr güvenlik etkinlikleri için günlük etkinleştirebilirsiniz. Yöneticiler sonra <b>Sistem araçları->Denetim</b> menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</b> tarafından ayarlanabilir.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Yuvarlama oranı basamağı (10 tabanından farklı yuvar
 UnitPriceOfProduct=Bir ürünün net birim fiyatı
 TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (net/KDV/vergi dahil)
 ParameterActiveForNextInputOnly=Yalnız sonraki giriş için etkili Parametre
-NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği henüz kaydedilmedi. Eğer “kurulum - güvenlik – denetim” sayfasında denetim etkinleştirilmemiş ise bu normal olabilir.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın
 BackupDesc=Tam bir Dolibarr yedeklemesi için şunları yapmalısınız:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Tamamlayıcı öznitelikler (sipariş satırları)
 ExtraFieldsSupplierInvoicesLines=Tamamlayıcı öznitelikler (fatura satırları)
 ExtraFieldsThirdParties=Ek öznitelikler (üçüncü taraf)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Tamamlayıcı öznitelikler (üye)
 ExtraFieldsMemberType=Tamamlayıcı öznitelikler (üye türü)
 ExtraFieldsCustomerInvoices=Tamamlayıcı öznitelikler (faturalar)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=Kullanıcı başına bildirimler listesi*
 ListOfNotificationsPerUserOrContact=Kullanıcı başına veya kişi başına bildirimler listesi**
 ListOfFixedNotifications=Sabit bildirimler listesi
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Kişilerden/adreslerden bildirimleri eklemek ya da kaldırmak için üçüncü taraf kişileri "Bildirimler" sekmesine git
 Threshold=Sınır
 BackupDumpWizard=Veritabanı yedekleme döküm dosyası oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Posta Kodu
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 9a70999c6d6..bf423937015 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -164,3 +164,5 @@ AddVariousPayment=Çeşitli ödemeler ekle
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index e8c312862a6..8e84ea549ec 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -12,7 +12,7 @@ BillsLate=Geç ödemeler
 BillsStatistics=Müşteri faturaları istatistikleri
 BillsStatisticsSuppliers=Tedarikçi faturaları istatistikleri
 DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotLastInvoice=Fatura silinebilir olmadığı için devre dışı. Bazı faturalar bundan sonra kaydedildi ve sayaçta boşluklar oluşturacaktır.
 DisabledBecauseNotErasable=Silinemediği için devre dışı bırakıldı
 InvoiceStandard=Standart fatura
 InvoiceStandardAsk=Standart fatura
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma fatura
 InvoiceProFormaDesc=<b>Proforma fatura</b> gerçek faturanın bir görüntüsüdür ancak muhasebe değeri yoktur.
 InvoiceReplacement=Fatura değiştirme
 InvoiceReplacementAsk=Fatura değiştirme yapılacak fatura
-InvoiceReplacementDesc=<b>Fatura değiştirme</b> henüz tahsilat yapılmamış bir faturanın iptal edilmesi ve tamamen değiştirilmesi için kullanılır.<br><br>Not: Yalnızca ödeme yapılmamış faturalar değiştirilebilir. Değiştirdiğiniz fatura eğer henüz kapataılmamışsa, kullanılmamak üzere otomatik olarak kapatılacaktır.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=İade faturası
 InvoiceAvoirAsk=Fatura düzeltmek için iade faturası
-InvoiceAvoirDesc=<b>İade Faturası</b> bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade etmiştir).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=İlk faturadan alınan kalemlerle İade Faturası oluştur
 invoiceAvoirWithPaymentRestAmount=İlk faturanın ödenmemiş bakiyeli İade Faturası
 invoiceAvoirLineWithPaymentRestAmount=Ödenmemiş kalan tutar için İade Faturası
@@ -66,8 +66,8 @@ paymentInInvoiceCurrency=fatura para biriminde
 PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
@@ -79,7 +79,7 @@ PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Zaten yapılmış geri ödemeler
 PaymentRule=Ödeme kuralı
 PaymentMode=Ödeme türü
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Banka/Kredi Kartı
 PaymentTypePP=PayPal
 IdPaymentMode=Ödeme türü (id)
 CodePaymentMode=Ödeme türü (kod)
@@ -91,8 +91,8 @@ PaymentConditionsShort=Ödeme koşulları
 PaymentAmount=Ödeme tutarı
 ValidatePayment=Ödeme doğrula
 PaymentHigherThanReminderToPay=Ödeme hatırlatmasından daha yüksek ödeme
-HelpPaymentHigherThanReminderToPay=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.<br> Girişinizi düzeltin, aksi durumda her fazla ödenen fatura için bir iade faturası oluşturmayı onaylayın ve düşünün.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Sınıflandırma ‘Ödendi’
 ClassifyPaidPartially=Sınıflandırma ‘Kısmen ödendi’
 ClassifyCanceled=’Terkedildi’ olarak sınıflandır
@@ -107,8 +107,8 @@ SearchACustomerInvoice=Müşteri faturası ara
 SearchASupplierInvoice=Tedarikçi faturası ara
 CancelBill=Fatura iptal et
 SendRemindByMail=EPosta ile anımsatma gönder
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
+DoPayment=Ödeme girin
+DoPaymentBack=Para iadesi girin
 ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into available credit
 ConvertExcessPaidToReduc=Convert excess paid into available discount
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Kapalı (ödenmemiş)
 BillStatusClosedPaidPartially=Ödenmiş (kısmen)
 BillShortStatusDraft=Taslak
 BillShortStatusPaid=Ödenmiş
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Ödenmiş
 BillShortStatusCanceled=Terkedilmiş
 BillShortStatusValidated=Doğrulanmış
@@ -141,36 +142,36 @@ BillShortStatusNotRefunded=Geri ödeme yapılmadı
 BillShortStatusClosedUnpaid=Kapalı
 BillShortStatusClosedPaidPartially=Ödenmiş (Kısmen)
 PaymentStatusToValidShort=Doğrulanacak
-ErrorVATIntraNotConfigured=KDV numarası henüz tanımlanmamış
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Hiç ödeme biçimi tanımlanmamış. Bunu düzeltmek için fatura modülü kurulumuna gidin.
 ErrorCreateBankAccount=Bir banka hesabı oluşturun, daha sonra ödeme biçimi tanımlamak için fatura modülünün kurulum paneline gidin.
 ErrorBillNotFound=Fatura %s mevcut değil
-ErrorInvoiceAlreadyReplaced=Hata, fatura %s le değiştirilecek bir faturayı doğrulamaya çalışıyorsunuz. Ama bu fatura zaten fatura %s ile değiştirilmiş.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Hata, indirim zaten kullanılmış
 ErrorInvoiceAvoirMustBeNegative=Hata, doğru fatura eksi bir tutarda olmalıdır
 ErrorInvoiceOfThisTypeMustBePositive=Hata, bu türde bir fatura artı tutarda olmalıdır
 ErrorCantCancelIfReplacementInvoiceNotValidated=Hata, halen taslak durumunda olan bir faturayla değiştirilmiş bir faturayı iptal edemezsiniz
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Kimden
 BillTo=Kime
 ActionsOnBill=Fatura üzerindeki eylemler
-RecurringInvoiceTemplate=Template / Recurring invoice
+RecurringInvoiceTemplate=Şablon/Yinelenen fatura
 NoQualifiedRecurringInvoiceTemplateFound=Oluşturmak için gerekli nitelikte yinelenen fatura şablonu yok.
 FoundXQualifiedRecurringInvoiceTemplate=Oluşturmak için gerekli nitelikte %s yinelenen fatura(lar) şablonu bulundu.
 NotARecurringInvoiceTemplate=Bir yinelenen fatura şablonu değil
 NewBill=Yeni fatura
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s supplier template invoices
+LastBills=En son %s fatura
+LatestTemplateInvoices=En son %s şablon fatura
+LatestCustomerTemplateInvoices=En son %s müşteri şablon faturası
+LatestSupplierTemplateInvoices=En son %s tedarikçi şablon faturası
 LastCustomersBills=En yeni %s müşteri faturaları 
 LastSuppliersBills=En son %s tedarikçi faturaları
 AllBills=Tüm faturalar
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Tüm şablon faturaları
 OtherBills=Diğer faturalar
 DraftBills=Taslak faturalar
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Supplier draft invoices
+CustomersDraftInvoices=Müşteri taslak faturaları
+SuppliersDraftInvoices=Tedarikçi taslak faturaları
 Unpaid=Ödenmemiş
 ConfirmDeleteBill=Bu faturayı silmek istediğinizden emin misiniz?
 ConfirmValidateBill=<b>%s</b> referanslı bu faturayı doğrulamak istediğiniz emin misiniz?
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=<b>%s</b> faturasının durumunu ödenmiş olarak deği
 ConfirmCancelBill=<b>%s</b> faturasını iptal etmek istediğinizden emin misiniz?
 ConfirmCancelBillQuestion=Neden bu faturayı ‘vazgeçilmiş’ olarak sınıflandırmak istiyorsunuz?
 ConfirmClassifyPaidPartially=<b>%s</b> faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
-ConfirmClassifyPaidPartiallyQuestion=Bu fatura tamamen ödenmemiş. Bu faturayı kapatmak için nedenler nelerdir?
-ConfirmClassifyPaidPartiallyReasonAvoir=Kalan bakiye <b>(%s %s)</b> ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla ayarIanır.
+ConfirmClassifyPaidPartiallyQuestion=Bu fatura tamamen ödenmedi. Bu faturayı kapatmanızın neden(ler)i nedir?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Kalan ödenmemiş tutar <b>(%s %s)</b> ödeme vadesinden önce ödendiğinden bir indirim olarak verilmiştir. Burada KDV sini kaybetmeyi kabul ediyorum.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Kalan bakiye <b>(%s %s)</b> ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla düzeltilir.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Kötü müşteri
 ConfirmClassifyPaidPartiallyReasonProductReturned=Ürünler kısmen iade edildi
 ConfirmClassifyPaidPartiallyReasonOther=Diğer bir nedenle terkedilen tutar
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Eğer fatura uygun yorum ile sağlanmışsa, bu seçim mümkündür. (Örneğin; «Fiyatın karşılığı olan verginin gerçekten ödenmiş olması indirim yapılması hakkını verir»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Bazı ülkelerde, bu seçenek yalnızca fatura doğru notu içeriyorsa mümkün olabilir.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Eğer diğerlerinin hiçbiri uymuyorsa bu seçimi kullanın
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Bir <b>Kötü müşteri</b> borçlarını ödemeyi reddeden müşteridir.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Bir <b>kötü müşteri</b> borcunu ödemeyi reddeden müşteridir.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Bu seçenek, bazı ürün iadelerinden dolayı ödeme tamamlanamazsa, kullanılır.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Bu seçeneği, eğer diğerlerinin hiçbiri uymazsa kullanın, örneğin aşağıdaki durumda:<br>- bazı ürünlerin geri sevkedilmesinden dolayı ödeme tamalanamzsa<br>- istenen tutar çok önemli çünkü indirim unutulmuştur.<br> Bütün durumlarda, istenen fazla tutar muhasebe sisteminde bir iade faturası oluşturularak düzeltilir.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Diğer
 ConfirmClassifyAbandonReasonOtherDesc=Diğer bütün durumlarda bu seçenek kullanılacaktır. Örneğin; bir fatura değiştirmeyi tasarladığınızda.
 ConfirmCustomerPayment=Bu ödeme girişini <b>%s </ b>%s için onaylıyor musunuz?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Bu ödeme girişini <b>%s </ b>%s için onaylıyor musunu
 ConfirmValidatePayment=Bu ödemeyi doğrulamak istediğinizden emin misiniz? Ödeme doğrulandıktan sonra hiçbir değişiklik yapılamaz.
 ValidateBill=Fatura doğrula
 UnvalidateBill=Faturadan doğrulamayı kaldır
-NumberOfBills=Fatura sayısı
-NumberOfBillsByMonth=Aylık fatura sayısı
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Faturaların tutarı
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Aylık fatura tutarı (vergisiz net)
 ShowSocialContribution=Sosyal/mali vergi göster
 ShowBill=Fatura göster
@@ -260,9 +262,9 @@ Repeatables=Şablonlar
 ChangeIntoRepeatableInvoice=Fatura şablonuna dönüştür
 CreateRepeatableInvoice=Fatura şablonu oluştur
 CreateFromRepeatableInvoice=Fatura şablonundan oluştur
-CustomersInvoicesAndInvoiceLines=Müşteri faturaları ve fatura satırları
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Müşteri faturaları ve ödemeleri
-ExportDataset_invoice_1=Müşteri faturaları listesi ve fatura satırları
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Müşteri faturaları ve ödemeleri
 ProformaBill=Proforma Fatura:
 Reduction=Kesinti
@@ -300,11 +302,11 @@ DiscountOfferedBy=Veren
 DiscountStillRemaining=Discounts or credits available
 DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Müşteri indirimleri
-SupplierDiscounts=Vendors discounts
+SupplierDiscounts=Tedarikçi indirimleri
 BillAddress=Fatura adresi
-HelpEscompte=Bu indirim, vadesinden önce ödeme yapıldığından dolayı müşteriye verilir.
-HelpAbandonBadCustomer=Bu tutardan vazgeçilmiştir (müşteri kötü bir müşteri olarak kabul edildiğinden dolayı) ve istisnai bir kayıp olarak kabul edilir.
-HelpAbandonOther=Bir hata olduğundan dolayı bu tutardan vazgeçilmiştir (örneğin yanlış müşteri ya da bir faturanın başka faturayla değiştirilmesi durumu gibi)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Sosyal/mali vergi ödeme kimliği
 PaymentId=Ödeme no
 PaymentRef=Ödeme ref.
@@ -321,35 +323,35 @@ InvoiceNotChecked=Seçilen yok fatura
 CloneInvoice=Fatura kopyala
 ConfirmCloneInvoice=<b>%s</b> faturasını kopyalamak istediğinizden emin misiniz?
 DisabledBecauseReplacedInvoice=Eylem engellendi, çünkü fatura değiştirilmiştir
-DescTaxAndDividendsArea=Bu alan özel harcamalar için yapılmış tüm ödemelerin bir özetini sunar.  Burası sadece sabit yıl boyunca yapılmış ödeme kaydını kapsar.
-NbOfPayments=Ödeme sayısı
+DescTaxAndDividendsArea=Bu alan, özel giderler için yapılmış tüm ödemelerin bir özetini sunar. Yalnızca sabit yıl boyunca yapılan ödeme kayıtları burada yeralır.
+NbOfPayments=No. of payments
 SplitDiscount=İndirimi ikiye böl
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Her iki kısım için tutar girin:
-TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indirim tutarına eşit olmalıdır.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
 RelatedBill=İlgili fatura
 RelatedBills=İlgili faturalar
 RelatedCustomerInvoices=İlgili müşteri faturaları
 RelatedSupplierInvoices=İlgili tedarikçi faturaları
 LatestRelatedBill=Son ilgili fatura
-WarningBillExist=Uyarı, bir yada çok fatura zaten var
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Birleştirme PDF aracı
 AmountPaymentDistributedOnInvoice=Faturaya dağıtılan ödeme tutarı
-PaymentOnDifferentThirdBills=Ana firmaya ait farklı üçüncü taraf faturalarında ödemeye izin ver 
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Ödeme notu
 ListOfPreviousSituationInvoices=Önceki hakediş faturaları listesi
 ListOfNextSituationInvoices=Sonraki hakediş faturaları listesi
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
+ListOfSituationInvoices=Durum faturalarının listesi
+CurrentSituationTotal=Toplam mevcut durum
 DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
+RemoveSituationFromCycle=Bu faturayı döngüden kaldır
 ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
 ConfirmOuting=Confirm outing
 FrequencyPer_d=Her %s günde
 FrequencyPer_m=Her %s ayda
 FrequencyPer_y=Her %s yılda
-FrequencyUnit=Frequency unit
+FrequencyUnit=Frekans birimi
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Sonraki fatura oluşturulacak tarih
 NextDateToExecutionShort=Date next gen.
@@ -365,7 +367,7 @@ DateIsNotEnough=Henüz tarihe ulaşılmadı
 InvoiceGeneratedFromTemplate=Fatura %s yinelenen fatura şablonundan %s oluşturuldu
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Uyarı, fatura tarihi şu anki tarihten çok uzak
-ViewAvailableGlobalDiscounts=View available discounts
+ViewAvailableGlobalDiscounts=Mevcut indirimleri görüntüle
 # PaymentConditions
 Statut=Durumu
 PaymentConditionShortRECEP=Teslimatta Peşin
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Çek
 PaymentTypeShortCHQ=Çek
 PaymentTypeTIP=TIP (Ödeme karşılığ belgeler)
 PaymentTypeShortTIP=TIP Ödemesi
-PaymentTypeVAD=İnternetten ödeme
-PaymentTypeShortVAD=İnternetten ödeme
+PaymentTypeVAD=Online ödeme
+PaymentTypeShortVAD=Online ödeme
 PaymentTypeTRA=Banka ödeme emri
 PaymentTypeShortTRA=Ödeme emri
 PaymentTypeFAC=Faktör
 PaymentTypeShortFAC=Faktör
 BankDetails=Banka ayrıntıları
 BankCode=Banka kodu
-DeskCode=Sıra kodu
+DeskCode=Ofis kodu
 BankAccountNumber=Hesap numarası
-BankAccountNumberKey=Anahtar
+BankAccountNumberKey=Basamakları kontrol et
 Residence=Otomatik ödeme
-IBANNumber=IBAN numarası
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT numarası
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Aşağıdaki banka hesabına havale ile ödem
 VATIsNotUsedForInvoice=* KDV uygulanmaz madde-293B CGI
 LawApplicationPart1=12/05/80 tarihli 80.335 yasasının uygulanması ile
 LawApplicationPart2=mallar şunun mülkiyetinde kalır
-LawApplicationPart3=satıcı ödemesini tamamlayıncaya kadar
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=fiyatları.
 LimitedLiabilityCompanyCapital=SARL nin sermayesi
 UseLine=Uygula
@@ -463,7 +465,7 @@ Cheques=Çekler
 DepositId=Depozit Kimliği
 NbCheque=Çek sayısı
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Fatura alıcısı olarak üçüncü parti adresi yerine müşteri faturası kişi adresini kullan
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Tüm ödenmemiş faturaları göster
 ShowUnpaidLateOnly=Ödenmemiş bütün faturaları göster
 PaymentInvoiceRef=Fatura %s ödemesi
@@ -474,21 +476,22 @@ Reported=Gecikmiş
 DisabledBecausePayments=Bazı ödemeler olduğundan dolayı mümkün değil
 CantRemovePaymentWithOneInvoicePaid=En az bir fatura ödenmiş olarak sınıflandırıldığı için ödemeyi silemezsiniz
 ExpectedToPay=Beklenen ödeme
-CantRemoveConciliatedPayment=Uzlaşılmış ödeme silinemiyor
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Bu ödeme ile ödenmiş
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Tamamı ödenmiş iade faturalarını "Ödendi" olarak sınıflandır.
-ClosePaidContributionsAutomatically=Tamamı ödenmiş tüm sosyal ve mali katkı paylarını "Ödendi" olarak sınıflandır.
-AllCompletelyPayedInvoiceWillBeClosed=Bakiyesi kalmayan bütün faturalar otomatikmen kapatılarak "Ödendi" durumuna getirilecektir.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
 ListOfYourUnpaidInvoices=Ödenmemiş fatura listesi
 NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı olduğunuz üçüncü partilere ait faturaları içerir.
 RevenueStamp=Bandrol
-YouMustCreateInvoiceFromThird=Üçüncü tarafa ait "müşteri" sekmesinden fatura oluşturulduğunda seçenek geçerlidir
-YouMustCreateInvoiceFromSupplierThird=Üçüncü tarafa ait "tedarikçi" sekmesinden fatura oluşturulduğunda seçenek geçerlidir
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
 PDFCrabeDescription=Fatura PDF şablonu Crabe. Tam fatura şablonu  (Önerilen şablon)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Fatura PDF şablonu Crevette. Durum faturaları için eksiksiz bir fatura şablonu
 TerreNumRefModelDesc1=Standart faturalar için numarayı  %syymm-nnnn biçiminde ve iade faturaları için %syymm-nnnn biçiminde göster, yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir.
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Fatura satırı ilerleyişi sonraki fatura satırından
 updatePriceNextInvoiceErrorUpdateline=Hata : Faturanın bu satırı üzerindeki fiyatı güncelle : %s
 ToCreateARecurringInvoice=Bu sözleşme için yinelenen fattura oluşturmak için önce bu taslak faturayı oluşturun sonra onu bir fatura şablonuna dönüştürün ve sonraki faturaların oluşması için süre tanımlayın.
 ToCreateARecurringInvoiceGene=Gelecekteki faturaları düzenli ve manuel olarak oluşturmak için yalnızca <strong>%s - %s - %s</strong> menüsüne gidin.
-ToCreateARecurringInvoiceGeneAuto=Eğer böyle otomatik oluşturulan faturalara gereksinim duyuyorsanız, yöneticinizden <strong>%s</strong> modülünü etkinleştirmesini ve ayarlamasını isteyin. Her iki yöntemin (manuel ve otomatik) tekrarlama riski olmadan birlikte kullanılabileceğini unutmayın.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Fatura şablonunu sil
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Başlangıç tarihini ayarla
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Bitiş tarihini ayarla
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Fatura silindi
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 3da6cad2b44..9e4b44714db 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Firma göster
 ShowStock=Depo göster
 DeleteArticle=Bu malı kaldırmak için tıkla
 FilterRefOrLabelOrBC=Ara (Ref/Etiket)
-UserNeedPermissionToEditStockToUsePos=Fatura oluştururken stok arttırmanız istenir, böylece POS kullanan kullanıcı stok düzenlemek için izne gereksinim duyar.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Fiş Yazıcısı
+PointOfSale=Satış Noktası
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Tablo ekle
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Sipariş yazıcıları
+SearchProduct=Ürün ara
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 31e0034a764..7b5448ecec3 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Telefon çağrısı
 ActionAC_FAX=Faks gönder
 ActionAC_PROP=Teklifi postayla gönder
 ActionAC_EMAIL=Eposta gönder
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Toplantılar
 ActionAC_INT=Siteden müdahale
 ActionAC_FAC=Müşteri faturasını postayla gönder gönder
@@ -60,8 +61,8 @@ ActionAC_CLO=Kapat
 ActionAC_EMAILING=Toplu eposta gönder
 ActionAC_COM=Müşteri siparişini postayla gönder
 ActionAC_SHIP=Sevkiyatı postayla gönder
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Satınalma siparişini e-posta ile gönder
+ActionAC_SUP_INV=Tedarikçi faturasını e-posta ile gönder
 ActionAC_OTH=Diğer
 ActionAC_OTH_AUTO=Otomatikman eklenen etkinlikler
 ActionAC_MANUAL=Elle eklenen etkinlikler
@@ -72,8 +73,8 @@ StatusProsp=Aday durumu
 DraftPropals=Taslak teklifler
 NoLimit=Sınır yok
 ToOfferALinkForOnlineSignature=Online imza için link
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=%s'dan ticari teklifleri kabul etme sayfasına hoş geldiniz.
 ThisScreenAllowsYouToSignDocFrom=Bu ekran, bir teklifi kabul etmenize ve imzalamanıza veya reddetmenize olanak sağlar.
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+ThisIsInformationOnDocumentToSign=Bu, kabul veya reddedilecek belge hakkında bilgidir
+SignatureProposalRef=Ticari teklifin imzası %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
index 189416aa811..36278d50806 100644
--- a/htdocs/langs/tr_TR/dict.lang
+++ b/htdocs/langs/tr_TR/dict.lang
@@ -160,7 +160,7 @@ CountryMD=Moldavya
 CountryMN=Moğolistan
 CountryMS=Montserrat
 CountryMZ=Mozambik
-CountryMM=Birmanya (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibya
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad ve Tobago
 CountryTR=Türkiye
 CountryTM=Türkmenistan
-CountryTC=Türk ve Caicos Adaları
+CountryTC=Turks ve Caicos Adaları
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrayna
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupisi
 CurrencySingMUR=Mauritius Rupisi
 CurrencyNOK=Norveç Kronu
-CurrencySingNOK=Norveç Kronu
+CurrencySingNOK=Norveç kronu
 CurrencyTND=Tunus dinarı
 CurrencySingTND=Tunus dinarı
 CurrencyUSD=ABD Doları
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Başkasından duyarak
 DemandReasonTypeSRC_PARTNER=İş Ortağı
 DemandReasonTypeSRC_EMPLOYEE=Çalışan
 DemandReasonTypeSRC_SPONSORING=Destekçi
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Biçim 4A0
 PaperFormatEU2A0=Biçim 2A0
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 9bf6bd63247..73bee79b9b3 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Dizindeki belge sayısı
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Dizin
 ECMSectionManual=Manuel dizin
 ECMSectionAuto=Otomatik dizin
@@ -34,6 +34,8 @@ ECMDocsByProjects=Projelere bağlı belgeler
 ECMDocsByUsers=Kullanıcılara bağlantılı belgeler
 ECMDocsByInterventions=Müdahalelere bağlantılı belgeler
 ECMDocsByExpenseReports=Gider raporlarına bağlı dokümanlar
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Hiçbir dizin oluşturulmadı
 ShowECMSection=Dizini göster
 DeleteSection=Dizini kaldır
@@ -42,10 +44,9 @@ ECMDirectoryForFiles=Dosyalar için göreceli dizin
 CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
 CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Dosya yöneticisi
-ECMSelectASection=Select a directory in the tree...
+ECMSelectASection=Soldaki ağaçtan bir dizin seçin...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=Dizin bulunamadı
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 41f33967317..3d2f664a934 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP istemcisinde '%s' hatası
 ErrorGlobalVariableUpdater5=Seçilmiş genel değişken yok
 ErrorFieldMustBeANumeric=<b>%s</b> alanı sayısal bir değer olmalıdır
 ErrorMandatoryParametersNotProvided=Zorunlu parametre(ler) girilmemiş
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modül Tanımlayıcıda hatalı Menu Dizisi tanımı (fk_menu anahtarı için hatalı değer)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak eposta adresi de kullanılabilir.
 WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/help.lang b/htdocs/langs/tr_TR/help.lang
index 24588ff63e6..54e22a67922 100644
--- a/htdocs/langs/tr_TR/help.lang
+++ b/htdocs/langs/tr_TR/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Çevrimiçi gerçek zamanlı/uzaktan destek
 OtherSupport=Diğer destek
 ToSeeListOfAvailableRessources=İletişim için/mevcut kaynaklara bakın:
 HelpCenter=Yardım merkezi
-DolibarrHelpCenter=Dolibarr yardım ve destek merkezi
-ToGoBackToDolibarr=Aksi takdirde Dolibarr’ı kullanmak için<a href="%s">burayı tıklayın</a>
-TypeOfSupport=Destek Kaynağı
+DolibarrHelpCenter=Dolibarr Yardım ve Destek Merkezi
+ToGoBackToDolibarr=Aksi takdirde, <a href="%s">Dolibarr'ı kullanmaya devam etmek için buraya tıklayın</a>.
+TypeOfSupport=Destek türü
 TypeSupportCommunauty=Genel (ücretsiz)
 TypeSupportCommercial=Ticaret
 TypeOfHelp=Tür
@@ -15,12 +15,9 @@ NeedHelpCenter=Yardım veya desteğe mi ihtiyacınız var?
 Efficiency=Verim
 TypeHelpOnly=Yalnızca yardım
 TypeHelpDev=Yardım+Geliştirme
-TypeHelpDevForm=Yardım+Geliştirme+Biçimlendirme
-ToGetHelpGoOnSparkAngels1=Bazı firmalar ve bilgisayarınızın kontrolünü alarak daha hızlı çevrimiçi destek verir (bazen anında). Bu tür yardımcılar <b>%s</b> web sitesinden bulunabilir:
-ToGetHelpGoOnSparkAngels3=Ayrıca Dolibarr’n tüm eğiticileri listesine bakabilirsiniz, bunun için burayı tıklayın
-ToGetHelpGoOnSparkAngels2=Bazen, arama yaptığınız sırada bir firma bulunmaz, bu nedenle süzgeçi “uygun olanların hepsi” değiştirerek aramayı düşünün.
-BackToHelpCenter=Aksi durumda yardım merkezine geri gitmek için <a href="%s">burayı </a>.
-LinkToGoldMember=Bo parçaçcığı (widget) tıklayarak Dolibar tarafından sizin için dilinizde önseçilen eğitmeni arayabilirsiniz (durumu ve ençok ücreti otomatikmen güncellenir):
+TypeHelpDevForm=Yardım + Geliştirme + Eğitim
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Desteklenen diller
-SubscribeToFoundation=Dolibarr projesine yardım edin, vakıfa abone olun
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Kendi dilinizde Dolibarr desteği için: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 3f8a59efe74..769b34aaeff 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=IK
-Holidays=İzinler
-CPTitreMenu=İzinler
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Aylık özet
 MenuAddCP=Yeni izin isteği
-NotActiveModCP=Bu sayfayı görmek için İzinler modülünü etkinleştirmelisiniz
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Bir izin isteği yap
 DateDebCP=Başlama tarihi
 DateFinCP=Bitiş tarihi
@@ -15,13 +15,18 @@ ApprovedCP=Onaylandı
 CancelCP=İptal edildi
 RefuseCP=Reddedildi
 ValidatorCP=Onaylayan
-ListeCP=İzinler listesi
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Şunun tarafından onaylanacak
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Açıklama
 SendRequestCP=İzin isteği oluştur
 DelayToRequestCP=İzin istekleri enaz <b>%s gün</b> önce yapolmalıdır.
-MenuConfCP=İzinlerin bakiyesi
-SoldeCPUser=İzin bakiyesi <b>%s</b> gündür.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Başlama tarihinden büyük bir bitiş tarihi seçmelisiniz.
 ErrorSQLCreateCP=Oluşturma sırasında bir SQL hatası oluştu:
 ErrorIDFicheCP=Bir hata oluştu, izin isteği yok.
@@ -30,7 +35,14 @@ ErrorUserViewCP=İzin isteklerini okumak için yetkiniz yok.
 InfosWorkflowCP=Bilgi işakışı
 RequestByCP=İsteyen
 TitreRequestCP=İzin isteği
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Tüketilen tatil gün sayısı
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Düzenle
 DeleteCP=Sil
 ActionRefuseCP=Reddet
@@ -59,6 +71,7 @@ DateRefusCP=Ret tarihi
 DateCancelCP=İptal tarihi
 DefineEventUserCP=Bir kullanıcı için özel izin tahsis et
 addEventToUserCP=İzin Tahsisi
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Neden
 UserCP=Kullanıcı
 ErrorAddEventToUserCP=Özel izin eklenirken hata oluştu.
@@ -81,10 +94,15 @@ EmployeeFirstname=Çalışanın ilk adı
 TypeWasDisabledOrRemoved=Ayrılma türü (id %s) devre dışı bırakıldı veya kaldırıldı
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=İzin tahsislerinin son otomatik güncellenmesi
-MonthOfLastMonthlyUpdate=Tahsis edilen izinlerin otomatik güncellendiği son ay
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Güncelleme başarılı
 Module27130Name= İzin istekleri yönetimi
 Module27130Desc= İzin istekleri yönetimi
@@ -94,7 +112,7 @@ NoticePeriod=Bildirim dönemi
 HolidaysToValidate=İzin isteği doğrula
 HolidaysToValidateBody=Doğrulanacak izin isteği aşağıdadır
 HolidaysToValidateDelay=Bu izin isteği %s günden kısa bir sürede gerçekleşecektir.
-HolidaysToValidateAlertSolde=Bu izin isteğini yapan kullanıcının yeterli uygun günü yok.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Doğrulanmış izin istekleri
 HolidaysValidatedBody=İzin isteğiniz %s - %s arası doğrulanmıştır.
 HolidaysRefused=İstek reddedildi
@@ -103,4 +121,9 @@ HolidaysCanceled=İptal edilen izin istekleri
 HolidaysCanceledBody=%s - %s arası izin isteğiniz iptal edilmiştir.
 FollowedByACounter=1: Bu türdeki bir izin isteği bir sayaçla izlenmelidir. Bu sayaç elle ya da otomatik olarak arttırılır ve bir izin isteği doğrulandığında sayaç azaltılır.<br>0: Bir sayaçla izlenmez.
 NoLeaveWithCounterDefined=Bir sayaçla izlenmek üzere tanımlanan hiç izin isteği yok.
-GoIntoDictionaryHolidayTypes=Farklı izin türleri ayarlamak için <strong>Giriş - Ayarlar - Sözlükler - İzin türleri</strong> menüsüne git.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 2816c0c2da7..e030fc086da 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -200,6 +200,7 @@ MigrationRemiseEntity=value of llx_societe_remise varlık alanını güncelle
 MigrationRemiseExceptEntity=llx_societe_remise_except varlık alanını güncelle
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Modülü yeniden yükle %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show unavailable options
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 08dce1c5b29..b9aae0e18f5 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Bu üçüncü partinin kişileri
 ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
 AddressesForCompany=Bu üçüncü partinin adresleri
 ActionsOnCompany=Bu üçüncü parti hakkındaki etkinlikler
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Bu üye hakkındaki etkinlikler
 ActionsOnProduct=Bu ürünle ilgili etkinlikler
 NActionsLate=%s son
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Para birimini ayarla
 BulkActions=Toplu eylemler
 ClickToShowHelp=Araç ipucu yardımını göstermek için tıklayın
-WebSite=Web sitesi
-WebSites=Web siteleri
-WebSiteAccounts=Web sitesi hesapları
+WebSite=Website
+WebSites=Websiteleri
+WebSiteAccounts=Website accounts
 ExpenseReport=Gider raporu
 ExpenseReports=Gider raporları
 HR=İK
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Toplu taslak silme onayı
 FileSharedViaALink=Dosya bir bağlantı üzerinden paylaşıldı
 SelectAThirdPartyFirst=Önce bir üçüncü parti seçin...
 YouAreCurrentlyInSandboxMode=Şu anda %s "sandbox" modundasınız
+Inventory=Envanter
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 9f1e632d0e4..2907be72ffa 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Bağlantılı nesne
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nBu, __EMAIL__ adresine gönderilen bir test mailidir.\nİki satır bir satırbaşı ile birbirinden ayrılır.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nBu bir <b>test</b> mailidir (test kelimesi kalın olmalıdır). <br> İki satır bir satırbaşı ile birbirinden ayrılır. <br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Websitesi modülü ayarları
 WEBSITE_PAGEURL=Sayfanın URL si
 WEBSITE_TITLE=Unvan
 WEBSITE_DESCRIPTION=Açıklama
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Anahtar kelimeler
 LinesToImport=Lines to import
diff --git a/htdocs/langs/tr_TR/paybox.lang b/htdocs/langs/tr_TR/paybox.lang
index de5a99e2622..8a5d7be7ae3 100644
--- a/htdocs/langs/tr_TR/paybox.lang
+++ b/htdocs/langs/tr_TR/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox modülü kurulumu
 PayBoxDesc=Bu modül <a href="http://www.paybox.com" target="_blank">Paybox</a> üzerinden müşteriler tarafından ödeme yapılmasını sağlar. Bu bir ücretsiz ödeme veya belirli bir Dolibarr nesnesine (fatura, siparş,…) bir ödeme yapmak için kullanılabilir
 FollowingUrlAreAvailableToMakePayments=Aşağıdaki URL'ler bir müşteriye Dolibarr nesnelerine bir ödeme yapmak için bir sayfa sunmak için kullanılabilir
 PaymentForm=Ödeme Formu
-WelcomeOnPaymentPage=Çevrimiçi ödeme hizmetimize hoşgeldiniz
+WelcomeOnPaymentPage=Çevrimiçi ödeme hizmetimize hoş geldiniz
 ThisScreenAllowsYouToPay=Bu ekran %s için çevrimiçi bir ödeme yapmanızı sağlar
 ThisIsInformationOnPayment=Bu yapılacak ödeme hakkında bilgidir
 ToComplete=Tamamlanacak
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=Bir müşteri faturası için çevrimiçi
 ToOfferALinkForOnlinePaymentOnContractLine=Bir sözleşme satırı için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnFreeAmount=Bir serbest ödeme için çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Bir müşteri üye aboneliği çevrimiçi %s ödemesi kullanıcı arayüzü sunan URL
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=Ayrıca; o URL'lerden herhangi birine <b>&tag=<i>value</i></b> url parametresini ekleyerek kendi ödeme açıklamanızın etiketini girebilirsiniz.
-SetupPayBoxToHavePaymentCreatedAutomatically=Paybox tarafından doğrulandığında ödemenin otomatik olarak oluşturulması için PayBox'ı <b>%s</b> url'si ile ayarlayın.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Bu sayfa ödeme kaydedilmiş olduğunu onaylar. Teşekkür ederim.
-YourPaymentHasNotBeenRecorded=Ödemeniz kaydedimelmiştir  ve işlem iptal edilmiştir. Teşekkür ederiz.
+YourPaymentHasNotBeenRecorded=Ödemeniz kaydedilmedi ve işlem iptal edildi. Teşekkür ederiz.
 AccountParameter=Hesap parametreleri
 UsageParameter=Kullanım parametreleri
 InformationToFindParameters=%s Hesap bilgilerinizi bulmanız için yardım
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 7360e82b13f..d5ef01b45d0 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=İmzalı(faturalanacak)
 PropalStatusNotSigned=İmzalanmamış (kapalı)
 PropalStatusBilled=Faturalanmış
 PropalStatusDraftShort=Taslak
-PropalStatusValidatedShort=Doğrulandı
+PropalStatusValidatedShort=Doğrulanmış (açık)
 PropalStatusClosedShort=Kapalı
 PropalStatusSignedShort=İmzalı
 PropalStatusNotSignedShort=İmzalanmamış
@@ -53,9 +53,9 @@ ErrorPropalNotFound=%s teklifi bulunamadı
 AddToDraftProposals=Taslak teklife ekle
 NoDraftProposals=Taslak teklif yok
 CopyPropalFrom=Varolan teklifi kopyalayarak teklif oluştur
-CreateEmptyPropal=Boş teklif oluştur veya ürünler/hizmetler listesinden oluştur
+CreateEmptyPropal=Boş veya Ürünler/Hizmetler listesinden ticari teklif oluştur
 DefaultProposalDurationValidity=Varsayılan teklif geçerlilik süresi (gün olarak)
-UseCustomerContactAsPropalRecipientIfExist=Teklif alıcısı olarak üçüncü parti yerine, eğer tanımlanmışsa, kişi adresini kullan
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Teklif kopyala
 ConfirmClonePropal=Ticari teklifi çoğaltmak istediğinizden emin misiniz? <b>%s</b>?
 ConfirmReOpenProp=Ticari teklifi geri açmak istediğinizden emin misiniz <b>%s</b>?
@@ -75,9 +75,10 @@ AvailabilityTypeAV_1M=1 ay
 TypeContact_propal_internal_SALESREPFOLL=Teklif izleme temsilcisi
 TypeContact_propal_external_BILLING=Müşteri faturası ilgilisi
 TypeContact_propal_external_CUSTOMER=Müşteri teklif izleme ilgilisi
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=Teslimat için müşteri iletişim kişisi
 # Document models
 DocModelAzurDescription=Eksiksiz bir teklif modeli (logo. ..)
+DocModelCyanDescription=Eksiksiz bir teklif modeli (logo. ..)
 DefaultModelPropalCreate=Varsayılan model oluşturma
 DefaultModelPropalToBill=Bir teklifi kapatma sırasında varsayılan şablon (faturalanacak)
 DefaultModelPropalClosed=Bir teklifi kapatma sırasında varsayılan şablon (faturalanmamış)
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 10e4e2720f3..423c33155ca 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteSetupDesc=Burada istediğiniz sayıda farklı websitesi oluşturun. Sonra Websitesi menüsüne giderek bunları düzenleyin.
+WebsiteSetupDesc=Kullanmak istediğiniz web sitelerini burada oluşturun. Daha sonra bunları düzenlemek için "Web siteleri" menüsüne gidin.
 DeleteWebsite=Websitesi sil
-ConfirmDeleteWebsite=Bu websitesini silmek istediğinizden emin misiniz? Bütün sayfaları ve içeriği silinecektir.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+ConfirmDeleteWebsite=Bu web sitesini silmek istediğinizden emin misiniz? Tüm sayfalar ve içerik de kaldırılacak.
+WEBSITE_TYPE_CONTAINER=Sayfa/kapsayıcı türü
+WEBSITE_PAGE_EXAMPLE=Örnek olarak kullanılacak web sayfası
 WEBSITE_PAGENAME=Sayfa adı/rumuz
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Dış CSS dosyası URL si
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_CSS_INLINE=CSS dosya içeriği (tüm sayfalarda ortak)
+WEBSITE_JS_INLINE=Javascript dosya içeriği (tüm sayfalarda ortak)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot dosyası (robots.txt)
-WEBSITE_HTACCESS=Web sitesinin .htaccess dosyası
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML başlığı (yalnızca bu sayfaya özgü)
 PageNameAliasHelp=Sayfanın adı veya takma adı.<br>Bu takma ad, web sitesi bir web sunucusunun (Apacke, Nginx gibi ...) Sanal host'undan çalıştırıldığında bir SEO URL'si oluşturmak için de kullanılır. Bu takma adı düzenlemek için "<strong>%s</strong>" düşmesini kullanın.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Medya kütüphanesi
-EditCss=Stil/CSS veya HTML başlığı düzenle
+EditCss=Web sitesi özelliklerini düzenle
 EditMenu=Menü düzenle
 EditMedias=Medyaları düzenle
-EditPageMeta=Meta Düzenle
-AddWebsite=Add website
+EditPageMeta=Sayfa/kapsayıcı özelliklerini düzenle
+EditInLine=Satır içi düzenle
+AddWebsite=Web sitesi ekle
 Webpage=Web sayfası/kapsayıcı
 AddPage=Sayfa/kapsayıcı ekle
 HomePage=Ana Sayfa
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Web sitenizin <strong>%s</strong> önizlemesi henüz hazır değil. Önce bir sayfa eklemelisiniz.
+PageContainer=Sayfa/kapsayıcı
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=İstenen %s kimlik numaralı sayfa henüz bir içeriğe sahip değil, önbellek dosyası .tpl.php kaldırıldı. Bu sorunu çözmek için sayfa içeriğini düzenleyin.
+SiteDeleted='%s' web sitesi silindi
 PageContent=Sayfa/Kapsayıcı
 PageDeleted=%s websitesinin Sayfa/Kapsayıcı '%s'  öğesi silindi
 PageAdded=Sayfa/Kapsayıcı '%s'  eklendi
@@ -36,49 +39,57 @@ ViewPageInNewTab=Siteyi yeni sekmede izle
 SetAsHomePage=Giriş Sayfası olarak ayarla
 RealURL=Gerçek URL
 ViewWebsiteInProduction=Web sitesini giriş URL si kullanarak izle
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Okundu
-WritePerm=Write
+WritePerm=Yaz
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=Harici web sunucusu tarafından sunulan sanal host URL'si tanımlanmamış
 NoPageYet=Henüz hiç sayfa yok
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanCreatePageOrImportTemplate=Yeni bir sayfa oluşturabilir veya tam bir web sitesi şablonunu içe aktarabilirsiniz
+SyntaxHelp=Belirli sözdizimi ipuçları hakkında yardım
+YouCanEditHtmlSourceckeditor=Düzenleyicideki "Kaynak" düğmesini kullanarak HTML kaynak kodunu düzenleyebilirsiniz
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Sayfa/kapsayıcı kopyala
 CloneSite=Siteyi kopyala
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
+PageIsANewTranslation=Yeni sayfa mevcut sayfanın çevirisi mi?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Üst sayfa kimliği
 WebsiteId=Web Sitesi Kimliği
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
-FetchAndCreate=Fetch and Create
-ExportSite=Export site
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Getir ve Oluştur
+ExportSite=Web sitesini dışa aktar
+ImportSite=Web sitesi şablonunu içe aktar
 IDOfPage=Sayfanın kimliği
 Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Web sitesi hesabı
-WebsiteAccounts=Web sitesi hesapları
+BlogPost=Blog yazısı
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Web sitesi hesabı oluştur
-BackToListOfThirdParty=Back to list for Third Party
+BackToListOfThirdParty=Üçüncü Parti listesine geri dön
 DisableSiteFirst=Önce web sitesini devre dışı bırak
 MyContainerTitle=Web sitemin başlığı
-AnotherContainer=Another container
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+AnotherContainer=Diğer kapsayıcı
+WEBSITE_USE_WEBSITE_ACCOUNTS=Web sitesi hesap tablosunu etkinleştir
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=Öncelikle varsayılan Giriş sayfasını tanımlamanız gerekir
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
+ImagesShouldBeSavedInto=Görüntüler dizine kaydedilmelidir
+WebsiteRootOfImages=Web sitesi görüntü dosyaları için kök dizin
+SubdirOfPage=Sayfaya adanmış alt-dizin
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Kurumsal Giriş sayfası
 EmptyPage=Boş sayfa
+ExternalURLMustStartWithHttp=Harici URL http:// veya https:// ile başlamalıdır
+ZipOfWebsitePackageToImport=Web sitesi paketinin zip dosyası
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Sayfanın iç URL'si
+ThisPageIsTranslationOf=Bu sayfa/kapsayıcı şunun çevirisidir:
+ThisPageHasTranslationPages=Bu sayfa/kapsayıcı'nın çevirisi mevcut
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 3bf3ffe3a0f..bcb094a1313 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Рахунки-фактури
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Умови платежу
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 3148777e43b..c73422c339d 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Продавець
 TransferTo=Покупець
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index bf9a1015f88..614d594f415 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Рахунок проформа
 InvoiceProFormaDesc=<b>Рахунок проформа</b> є образом оригінального рахунку, але не має бухгалтерського облікового запису.
 InvoiceReplacement=Заміна рахунка-фактури
 InvoiceReplacementAsk=Заміна рахунка-фактури на інший
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Кредитове авізо
 InvoiceAvoirAsk=Кредитове авізо для коригування рахунка-фактури
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Створити кредитове авізо зі строками з оригінального рахунка
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Повернення платежу
 DeletePayment=Видалити платіж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Платежі Постачальникам
 ReceivedPayments=Отримані платежі
 ReceivedCustomersPayments=Платежі, отримані від покупців
-PayedSuppliersPayments=Плетежі, відправлені постачальникам
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Отримані платежі покупців для підтвердження
 PaymentsReportsForYear=Звіти про платежі за %s
 PaymentsReports=Звіти про платежі
@@ -91,8 +91,8 @@ PaymentConditionsShort=Умови платежу
 PaymentAmount=Сума платежу
 ValidatePayment=Підтвердити платіж
 PaymentHigherThanReminderToPay=Платіж більший, ніж в нагадуванні про оплату
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Класифікувати як 'Сплачений'
 ClassifyPaidPartially=Класифікувати як 'Сплачений частково'
 ClassifyCanceled=Класифікувати як 'Анулюваний'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Закритий (неоплачений)
 BillStatusClosedPaidPartially=Сплачений (частково)
 BillShortStatusDraft=Проект
 BillShortStatusPaid=Сплачений
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Сплачений
 BillShortStatusCanceled=Анулюваний
 BillShortStatusValidated=Підтверджений
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Закритий
 BillShortStatusClosedPaidPartially=Сплачений (частково)
 PaymentStatusToValidShort=На підтвердженні
-ErrorVATIntraNotConfigured=Номер платника ПДВ ще не встановлений
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Режим оплати за умовчанням не встановлений. Перейдіть в налаштування модуля Рахунків-фактур для виправлення цієї ситуації.
 ErrorCreateBankAccount=Створіть банківський рахунок, а потім перейдіть до панелі налаштування модуля Рахунків-фактур для установки способів оплати
 ErrorBillNotFound=Рахунок %s не існує
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Помилка, знижка вже використовується
 ErrorInvoiceAvoirMustBeNegative=Помилка, правильний рахунок-фактура повинен мати негативну суму
 ErrorInvoiceOfThisTypeMustBePositive=Помилка, такий тип рахунку-фактури повинен мати позитивну суму
 ErrorCantCancelIfReplacementInvoiceNotValidated=Помилка, неможливо відмінити рахунок-фактуру, який був замінений на іншій рахунок-фактуру, що знаходиться в статусі проекту
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Продавець
 BillTo=Покупець
 ActionsOnBill=Дії з рахунком-фактурою
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Поганий Покупець
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукція частково повернена
 ConfirmClassifyPaidPartiallyReasonOther=Сума, анульована з інших причин
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Такий вибір можливий, тільки якщо рахунок-фактура був забезпечений необхідним коментарем. (Наприклад, "Тільки податок, що відповідає фактично сплаченій ціні, надає права на вирахування")
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=У деяких країнах, цей вибір може бути можливим тільки, якщо ваш рахунок-фактура містить правильні відомості.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Використайте цей вибір, якщо усі інші не підходять
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Поганий Покупець</b> - це замовник, який відмовляється оплачувати свої борги.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Цей вибір використовується при неповній оплаті, коли деяка продукція була повернена
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Використайте цей вибір, якщо усі інші не підходять, наприклад, в наступній ситуації: <br> - оплата не завершена, оскільки деякі товари були відправлені назад <br> - заявлена сума дуже важлива, тому що знижка була забута <br> У всіх випадках надмірно заявлена сума має бути виправлена в системі бухгалтерського обліку шляхом створення кредитних авізо.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Інший
 ConfirmClassifyAbandonReasonOtherDesc=Цей вибір використовуватиметься в усіх інших випадках. Наприклад, тому, що ви плануєте створити замінюючий рахунок-фактуру.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Підтвердити рахунок-фактуру
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=К-ть рахунків-фактур
-NumberOfBillsByMonth=К-ть рахунків-фактур по місяцях
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Сума рахунків-фактур
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Сума рахунків-фактур за місяць (за вирахуванням податку)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Показати рахунок-фактуру
@@ -260,9 +262,9 @@ Repeatables=Шаблони
 ChangeIntoRepeatableInvoice=Конвертувати в шаблон рахунки
 CreateRepeatableInvoice=Створити шаблон рахунка-фактури
 CreateFromRepeatableInvoice=Створити з шаблону рахунок-фактуру
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Рахунки-фактури і платежі Покупця
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Рахунки-фактури і платежі Покупця
 ProformaBill=Proforma Bill:
 Reduction=Скорочення
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Адреса виставляння
-HelpEscompte=Ця знижка надана Покупцеві за достроковий платіж.
-HelpAbandonBadCustomer=Від цієї суми відмовився Покупець (вважається поганим клієнтом) і вона вважається надзвичайною втратою.
-HelpAbandonOther=Від цієї суми відмовилися через помилку (наприклад, неправильний клієнт або рахунок-фактура був замінений на іншій)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Код платежу
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Рахунок-фактура не вибраний
 CloneInvoice=Дублювати рахунок-фактуру
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Дії відключені оскільки рахунок-фактура був замінений
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=К-ть платежів
+DescTaxAndDividendsArea=Ця зона представляє сумарну інформацію по платежах на спеціальні витрати. Тут будуть показані лише записи з платежами протягом фіксованого року.
+NbOfPayments=No. of payments
 SplitDiscount=Розділити знижку на дві
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Введіть суму кожної з двох частин:
-TotalOfTwoDiscountMustEqualsOriginal=Сума двох нових знижок має дорівнювати розміру первинної знижки.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Попередження! Рахунок чи рахунки вже існують
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Чек
 PaymentTypeShortCHQ=Чек
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Он-лайн платіж
-PaymentTypeShortVAD=Он-лайн платіж
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Проект
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Банківські реквізити
 BankCode=Код банку
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Номер рахунка
-BankAccountNumberKey=Ключ
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=Номер IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=Номер BIC/SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=товари залишаються у власності
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Застосувати
@@ -463,7 +465,7 @@ Cheques=Чеки
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Показати усі несплачені рахунки-фактури
 ShowUnpaidLateOnly=Паказати лише прострочені несплачені рахунки-фактури
 PaymentInvoiceRef=Оплата рахунка-фактури %s
@@ -474,21 +476,22 @@ Reported=Затриман
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Повернення платежу
 ListOfYourUnpaidInvoices=Список неоплачених рахунків
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index c6cb40c26df..79323e7519d 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index 1a440031dca..8b3d9eb8b2a 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/uk_UA/dict.lang b/htdocs/langs/uk_UA/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/uk_UA/dict.lang
+++ b/htdocs/langs/uk_UA/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uk_UA/help.lang b/htdocs/langs/uk_UA/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/uk_UA/help.lang
+++ b/htdocs/langs/uk_UA/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index 7add4c4483f..0f12aecc9c8 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Підстава
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index e602c612434..341eaf28f03 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/uk_UA/paybox.lang b/htdocs/langs/uk_UA/paybox.lang
index 592fcd05f00..a65cc41e46b 100644
--- a/htdocs/langs/uk_UA/paybox.lang
+++ b/htdocs/langs/uk_UA/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index 68ba1ad545f..e72bdcaae4a 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Виставлений
 PropalStatusDraftShort=Проект
-PropalStatusValidatedShort=Підтверджений
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Зачинено
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 9116f5cc204..396d576e87e 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Читати
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 08508d4e6e8..8d6e8e39b04 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Companies and contact management (customers, prospects...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
@@ -501,7 +501,7 @@ Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
 Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Suppliers
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Security audit events
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Net unit price of a product
 TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
 ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Complementary attributes (member)
 ExtraFieldsMemberType=Complementary attributes (member type)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 1d42581c344..37a1d03a2d3 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -7,7 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -76,6 +76,7 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only open accounts
@@ -104,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
@@ -135,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index f76ff018f9d..ed988d580e2 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Validate invoice
 UnvalidateBill=Unvalidate invoice
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=Show invoice
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bank details
 BankCode=Bank code
-DeskCode=Desk code
+DeskCode=Office code
 BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN number
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT number
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -463,7 +465,7 @@ Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
 PaymentInvoiceRef=Payment invoice %s
@@ -474,21 +476,22 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 1f51f375e89..353c4ee93ab 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of sales
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index efadc44d700..96b8abbb937 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Phone call
 ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Meetings
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
@@ -72,8 +73,8 @@ StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/uz_UZ/dict.lang b/htdocs/langs/uz_UZ/dict.lang
index 61a7237f472..ad3a24e12f6 100644
--- a/htdocs/langs/uz_UZ/dict.lang
+++ b/htdocs/langs/uz_UZ/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=India
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=North Korea
 CountryKR=South Korea
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lao
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad and Tobago
 CountryTR=Turkey
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraine
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Tunisian dinars
 CurrencySingTND=Tunisian dinar
 CurrencyUSD=US Dollars
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index 5200fa30b1d..43ddd3bf36f 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 3c806156c7c..a5555f85c82 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uz_UZ/help.lang b/htdocs/langs/uz_UZ/help.lang
index 6129cae362d..da776683a6a 100644
--- a/htdocs/langs/uz_UZ/help.lang
+++ b/htdocs/langs/uz_UZ/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
 HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Community (free)
 TypeSupportCommercial=Commercial
 TypeOfHelp=Type
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Efficiency
 TypeHelpOnly=Help only
 TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 1c19d69732a..951af61f273 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,13 +15,18 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edit
 DeleteCP=Delete
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -94,7 +112,7 @@ NoticePeriod=Notice period
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -103,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index fb521c0c085..c92d83988ff 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Just follow the instructions step by step.
 MiscellaneousChecks=Prerequisites check
 ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
 ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
-DatabasePrefix=Database prefix table
-AdminLogin=Login for Dolibarr database owner.
-PasswordAgain=Retype password a second time
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
-KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
-SaveConfigurationFile=Save values
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-FunctionNotAvailableInThisPHP=Not available on this PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Choose migration script
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version
 ServerVersion=Database server version
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
 InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade successful
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Contract data correction
 MigrationContractsNumberToUpdate=%s contract(s) to update
 MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 07e65a92651..0a050508edb 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index e8cd9b78d2f..ec0315b94cd 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
index 306aaeec047..0d35ac440fa 100644
--- a/htdocs/langs/uz_UZ/paybox.lang
+++ b/htdocs/langs/uz_UZ/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 8cf3a68167a..c258381ea85 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
 NoDraftProposals=No draft proposals
 CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=A complete proposal model (logo...)
+DocModelCyanDescription=A complete proposal model (logo...)
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index a44a4a68f09..91b4353b1a7 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=Tính năng đã vô hiệu hóa trong bản demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=Bạn có thể tìm thấy nhiều mô-đun để tải về ở các websites trên Internet ...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Tìm ứng dụng bên ngoài/ mô-đun
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=Công cụ đa module
 ModuleFamilyExperimental=Module thử nghiệm
 ModuleFamilyFinancial=Module tài chính (Kế toán/Ngân quỹ)
 ModuleFamilyECM=Quản lý nội dung điện tử (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Điều khiển menu
 MenuAdmin=Biên tập menu
@@ -463,9 +463,9 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Người dùng & Nhóm
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
-Module1Desc=Quản lý liên lạc và công ty (khách hàng, khách hàng tiềm năng ...)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=Thương mại
 Module2Desc=Quản lý thương mại
 Module10Name=Kế toán
@@ -501,7 +501,7 @@ Module23Desc=Giám sát việc tiêu thụ năng lượng
 Module25Name=Đơn hàng khách hàng
 Module25Desc=Quản lý đơn hàng khách hàng
 Module30Name=Hoá đơn
-Module30Desc=Quản lý hóa đơn và giấy báo có cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Nhà cung cấp
 Module40Desc=Suppliers and purchase management (purchase orders and billing)
 Module42Name=Debug Logs
@@ -902,7 +902,7 @@ DictionaryVAT=Tỉ suất VAT hoặc Tỉ xuất thuế bán hàng
 DictionaryRevenueStamp=Amount of tax stamps
 DictionaryPaymentConditions=Điều khoản thanh toán
 DictionaryPaymentModes=Phương thức thanh toán
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Định dạng giấy
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=Báo cáo Thuế địa phương là tổng của localtaxes b
 LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy với code đó
 LabelOnDocuments=Nhãn trên các tài liệu
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=Vào cuối tháng
 CurrentNext=Current/Next
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=Sự kiện kiểm toán bảo mật
-Audit=Kiểm toán
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=Thông tin trình duyệt
 InfoOS=About OS
@@ -1065,7 +1066,7 @@ BrowserName=Tên trình duyệt
 BrowserOS=Trình duyệt hệ điều hành
 ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr
 SecurityEventsPurged=Sự kiện bảo mật được thanh lọc
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số phân quyền Dolibarr có thể làm giảm giới hạn này.
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is d
 UnitPriceOfProduct=Đơn giá chưa thuế của một sản phẩm
 TotalPriceAfterRounding=Tổng giá (chưa thuế/VAT/bao gồm thuế) sau khi làm tròn
 ParameterActiveForNextInputOnly=Thông số hiệu quả cho chỉ đầu vào kế tiếp
-NoEventOrNoAuditSetup=Chưa có sự kiện bảo mật được ghi nhận. Đây có thể là bình thường nếu kiểm toán đã không được kích hoạt trên trang "Cài đặt - Bảo mật - kiểm toán".
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn
 BackupDesc=Để thực hiện một sao lưu đầy đủ của Dolibarr, bạn phải:
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
 ExtraFieldsSupplierOrdersLines=Thuộc tính bổ sung (chi tiết đơn hàng)
 ExtraFieldsSupplierInvoicesLines=Thuộc tính bổ sung (chi tiết hóa đơn)
 ExtraFieldsThirdParties=Thuộc tính bổ sung (của bên thứ ba)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Thuộc tính bổ sung (thành viên)
 ExtraFieldsMemberType=Thuộc tính bổ sung (loại thành viên)
 ExtraFieldsCustomerInvoices=Thuộc tính bổ sung (hoá đơn)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Danh sách thông báo cố định
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Thủ thuật tạo file dump sao lưu dự phòng cơ sở dữ liệu
 SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=Zip
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 8684c5da5b8..a9828bfcb30 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -7,7 +7,7 @@ BankName=Tên ngân hàng
 FinancialAccount=Tài khoản
 BankAccount=Tài khoản ngân hàng
 BankAccounts=Tài khoản ngân hàng
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=Hiện tài khoản
 AccountRef=Tài khoản tài chính ref
 AccountLabel=Nhãn tài khoản tài chính
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Địa chỉ tài khoản
 BankAccountCountry=Quốc gia tài khoản
 BankAccountOwner=Tên chủ tài khoản
 BankAccountOwnerAddress=Địa chỉ chủ sở hữu tài khoản
-RIBControlError=Kiểm tra tính toàn vẹn của các giá trị bị lỗi. Điều này có nghĩa là thông tin về số tài khoản này là không đầy đủ hoặc sai (kiểm tra cả nước, con số và IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Tạo tài khoản
 NewBankAccount=Tài khoản mới
 NewFinancialAccount=Tài khoản tài chính mới
@@ -76,6 +76,7 @@ TransactionsToConciliate=Mục cần đối chiếu
 Conciliable=Có thể được đối chiếu
 Conciliate=Đối chiếu
 Conciliation=Đối chiếu
+SaveStatementOnly=Save statement only
 ReconciliationLate=Đối chiếu sau
 IncludeClosedAccount=Bao gồm các tài khoản đã đóng
 OnlyOpenedAccount=Chỉ tài khoản đang mở
@@ -104,7 +105,7 @@ SocialContributionPayment=Thanh toán xã hội/ fiscal tax
 BankTransfer=Chuyển khoản ngân hàng
 BankTransfers=Chuyển khoản ngân hàng
 MenuBankInternalTransfer=Chuyển tiền nội bộ
-TransferDesc=Chuyển khoản từ 1 từ khoản này tới tài khoản khác. Hệ thống sẽ ghi 2 biểu ghi (1 ghi nợ trong tài khoản gốc và 1 tín dụng trong tài khoản nhận). Tổng số tương đương (kí hiệu trừ), nhãn và ngày sẽ được sử dụng cho giao dịch này.
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Từ
 TransferTo=Đến
 TransferFromToDone=Một chuyển khoản từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi lại.
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=Bạn có muốn xóa biên nhận séc này?
 BankChecks=Séc ngân hàng
 BankChecksToReceipt=Séc đợi tiền gửi
 ShowCheckReceipt=Hiện chứng từ séc ứng trước
-NumberOfCheques=Nb của séc
+NumberOfCheques=No. of check
 DeleteTransaction=Xóa mục kê khai
 ConfirmDeleteTransaction=Bạn có muốn xóa kê khai này?
 ThisWillAlsoDeleteBankRecord=Đồng thời còn xóa kê khai ngân hàng đã tạo
@@ -135,8 +136,8 @@ BankTransactionLine=Kê khai ngân hàng
 AllAccounts=All bank and cash accounts
 BackToAccount=Trở lại tài khoản
 ShowAllAccounts=Hiển thị tất cả tài khoản
-FutureTransaction=Giao dịch trong futur. Không có cách nào để đối chiếu
-SelectChequeTransactionAndGenerate=Chọn / kiểm tra bộ lọc để đưa vào nhận tiền gửi kiểm tra và bấm vào "Tạo".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Chọn bảng kê ngân hàng có quan hệ với việc đối chiếu. Sử dụng giá trị số có thể sắp xếp: YYYYMM hoặc YYYYMMDD
 EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
 ToConciliate=Để đối chiếu
@@ -153,7 +154,7 @@ RejectCheckDate=Ngày séc bị trả lại
 CheckRejected=Séc bị trả lại
 CheckRejectedAndInvoicesReopened=Séc bị trả lại và hóa đơn bị mở lại
 BankAccountModelModule=Mẫu tài liệu dàng cho tài khoản ngân hàng
-DocumentModelSepaMandate=Mẫu lệnh SEPA. Chỉ dùng cho các nước trong khối EEC
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Mẫu để in 1 trang với thông tin BAN
 NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
@@ -162,4 +163,6 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index efdab877df9..67514bc0e1f 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Hóa đơn hình thức
 InvoiceProFormaDesc=<b>Hóa đơn hình thức</b> là một hình ảnh của một hóa đơn thực, nhưng không có giá trị kế toán.
 InvoiceReplacement=Hóa đơn thay thế
 InvoiceReplacementAsk=Hóa đơn thay thế cho hóa đơn
-InvoiceReplacementDesc=<b>Hóa đơn thay thế</b> được sử dụng để hủy bỏ và thay thế hoàn toàn một hóa đơn không có thanh toán đã nhận được. <br><br> Ghi chú: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa đóng, nó sẽ được tự động đóng để 'bị loại bỏ'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Giấy báo có
 InvoiceAvoirAsk=Giấy báo có để chỉnh sửa hóa đơn
-InvoiceAvoirDesc=Những <b>giấy báo có</b> là một hóa đơn âm được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi anh ta trả lại một số sản phẩm chẳng hạn).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Tạo Giấy báo có với chi tiết từ hóa đơn gốc
 invoiceAvoirWithPaymentRestAmount=Tạo Giấy báo có với phần chưa trả còn lại từ hóa đơn gốc
 invoiceAvoirLineWithPaymentRestAmount=Số tiền chưa trả còn lại trên Giấy báo có
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Đã trả lại
 DeletePayment=Xóa thanh toán
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Nhà cung cấp thanh toán
 ReceivedPayments=Đã nhận thanh toán
 ReceivedCustomersPayments=Thanh toán đã nhận được từ khách hàng
-PayedSuppliersPayments=Thanh toán đã trả cho nhà cung cấp
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Đã nhận thanh toán khách hàng để xác nhận
 PaymentsReportsForYear=Báo cáo thanh toán cho %s
 PaymentsReports=Báo cáo thanh toán
@@ -91,8 +91,8 @@ PaymentConditionsShort=Điều khoản thanh toán
 PaymentAmount=Số tiền thanh toán
 ValidatePayment=Xác nhận thanh toán
 PaymentHigherThanReminderToPay=Thanh toán cao hơn so với đề nghị trả
-HelpPaymentHigherThanReminderToPay=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả. <br> Chỉnh sửa mục nhập của bạn, nếu không xác nhận và suy nghĩ về việc tạo ra một giấy báo có của phần dư nhận được cho mỗi hoá đơn đã nộp dư.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Phân loại 'Đã trả'
 ClassifyPaidPartially=Phân loại 'Đã trả một phần'
 ClassifyCanceled=Phân loại 'Đã loại bỏ'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=Đã đóng (chưa trả)
 BillStatusClosedPaidPartially=Đã trả (một phần)
 BillShortStatusDraft=Dự thảo
 BillShortStatusPaid=Đã trả
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=Đã trả
 BillShortStatusCanceled=Đã loại bỏ
 BillShortStatusValidated=Đã xác nhận
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Đã đóng
 BillShortStatusClosedPaidPartially=Đã trả (một phần)
 PaymentStatusToValidShort=Để xác nhận
-ErrorVATIntraNotConfigured=Số thuế VAT Intracommunautary chưa được xác định
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=Không có chế độ thanh toán mặc định được xác định. Tới phần thiết lập mô-đun hóa đơn để sửa lỗi này.
 ErrorCreateBankAccount=Tạo một tài khoản ngân hàng, sau đó đi vào bảng Thiết lập của mô-đun hóa đơn để xác định chế độ thanh toán
 ErrorBillNotFound=Hoá đơn %s không tồn tại
-ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn %s. Nhưng hóa đơn này đã được thay thế bằng hóa đơn %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Lỗi, giảm giá đã được sử dụng
 ErrorInvoiceAvoirMustBeNegative=Lỗi, chỉnh sửa hóa đơn phải có một số tiền âm.
 ErrorInvoiceOfThisTypeMustBePositive=Lỗi, hóa đơn loại này phải có một số tiền dương
 ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ một hóa đơn đã được thay thế bằng hóa đơn khác mà vẫn còn trong tình trạng dự thảo
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Từ
 BillTo=Đến
 ActionsOnBill=Hành động trên hoá đơn
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Phần chưa trả còn lại <b>(%s %s)</b> là giảm giá đã gán vì khoản thanh toán đã được thực hiện trước thời hạn. Tôi hợp thức VAT với giấy báo có
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Phần chưa trả còn lại <b>(%s %s)</b> là giảm giá đã gán vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận mất thuế VAT trên giảm giá này.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Phần chưa thanh trả còn lại <b>(%s %s)</b> là giảm giá được cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi thu hồi thuế VAT đối với giảm giá này mà không có một giấy báo có.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Khách hàng xấu
 ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm đã trả lại một phần
 ConfirmClassifyPaidPartiallyReasonOther=Số tiền đã bị loại bỏ cho lý do khác
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Sự lựa chọn này là có thể nếu hóa đơn của bạn đã được cung cấp với ghi chú phù hợp. (Ví dụ «Chỉ có thuế tương ứng với mức giá mà đã được trả thực tế thì có quyền khấu trừ»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự lựa chọn này là có thể chỉ khi hóa đơn của bạn chứa ghi chú chỉnh sửa.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một <b>khách hàng xấu</b> là một khách hàng mà từ chối trả nợ của mình.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Lựa chọn này được sử dụng khi thanh toán không đầy đủ vì một số sản phẩm đã được trả lại
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây: <br> - Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại <br> - Số tiền đòi quá lớn bởi vì quên giảm giá  <br> Trong mọi trường hợp, số tiền đòi vượt phải được chính sửa trong hệ thống kế toán bằng cách tạo ra một giấy báo có.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Khác
 ConfirmClassifyAbandonReasonOtherDesc=Lựa chọn này sẽ được sử dụng trong tất cả các trường hợp khác. Ví dụ bởi vì bạn có kế hoạch để tạo ra một hóa đơn thay thế.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Xác nhận hóa đơn
 UnvalidateBill=Chưa xác nhận hóa đơn
-NumberOfBills=Nb của hoá đơn
-NumberOfBillsByMonth=Nb của hoá đơn theo tháng
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Số tiền của hóa đơn
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (có thuế)
 ShowSocialContribution=Xem thuế social/fiscal
 ShowBill=Hiện thị hóa đơn
@@ -260,9 +262,9 @@ Repeatables=Mẫu
 ChangeIntoRepeatableInvoice=Chuyển đổi thành hóa đơn mẫu
 CreateRepeatableInvoice=Tạo hóa đơn mẫu
 CreateFromRepeatableInvoice=Tạo từ hóa đơn mẫu
-CustomersInvoicesAndInvoiceLines=Hoá đơn khách hàng và chi tiết hóa đơn
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=Hóa đơn khách hàng và thanh toán
-ExportDataset_invoice_1=Danh sách hóa đơn khách hàng và chi tiết hóa đơn
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Hóa đơn khách hàng và thanh toán
 ProformaBill=Ra hóa đơn hình thức:
 Reduction=Khấu trừ
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Địa chỉ ra hóa đơn
-HelpEscompte=Giảm giá này được cấp cho các khách hàng bởi vì thanh toán của nó đã được thực hiện trước thời hạn.
-HelpAbandonBadCustomer=Số tiền này đã bị loại bỏ (khách hàng được cho là một khách hàng xấu) và được coi là một ngoại lệ .
-HelpAbandonOther=Số tiền này đã bị loại bỏ vì đó là một lỗi (ví dụ khách hàng sai hoặc hóa đơn được thay thế bằng hóa đơn khác)
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=ID thanh toán
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=Không có hoá đơn được chọn
 CloneInvoice=Nhân bản hóa đơn
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Hành động vô hiệu hóa vì hóa đơn đã được thay thế
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=Nb của thanh toán
+DescTaxAndDividendsArea=Khu vực này trình bày một bản tóm tắt của tất cả các khoản thanh toán cho các chi phí đặc biệt. Chỉ có những hồ sơ mà thanh toán trong năm cố định được bao gồm ở đây.
+NbOfPayments=No. of payments
 SplitDiscount=Tách chiết khấu thành 2
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=Số tiền đầu vào cho mỗi hai phần:
-TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải bằng số tiền giảm giá ban đầu.
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Hóa đơn liên quan
 RelatedBills=Hoá đơn liên quan
 RelatedCustomerInvoices=Hóa đơn khách hàng liên quan
 RelatedSupplierInvoices=Hóa đơn nhà cung cấp liên quan
 LatestRelatedBill=Hóa đơn liên quan mới nhất
-WarningBillExist=Cảnh báo, một hoặc nhiều hóa đơn đã tồn tại
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Công cụ sáp nhập PDF
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Ghi chú thanh toán
 ListOfPreviousSituationInvoices=Danh sách hóa đơn tình huống trước đó
 ListOfNextSituationInvoices=Danh sách hóa đơn tình huống tiếp theo
@@ -408,19 +410,19 @@ PaymentTypeCHQ=Séc
 PaymentTypeShortCHQ=Séc
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Thanh toán trực tuyến
-PaymentTypeShortVAD=Thanh toán trực tuyến
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Dự thảo
 PaymentTypeFAC=Tác nhân
 PaymentTypeShortFAC=Tác nhân
 BankDetails=Chi tiết ngân hàng
 BankCode=Mã ngân hàng
-DeskCode=Đang quầy
+DeskCode=Office code
 BankAccountNumber=Số tài khoản
-BankAccountNumberKey=Khóa
+BankAccountNumberKey=Check digits
 Residence=Thấu chi trực ti
-IBANNumber=Số IBAN
+IBANNumber=IBAN complete account number
 IBAN=IBAN
 BIC=BIC / SWIFT
 BICNumber=Số BIC / SWIFT
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản vào tài
 VATIsNotUsedForInvoice=* Không áp dụng thuế VAT art-293B of CGI
 LawApplicationPart1=Bằng cách áp dụng luật 80.335 of 12/05/80
 LawApplicationPart2=hàng hóa duy trì đặc tính của
-LawApplicationPart3=người bán vẫn thanh toán tiền mặt hoàn toàn
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=giá của họ.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Áp dụng
@@ -463,7 +465,7 @@ Cheques=Séc
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc khách hàng để ra hóa đơn thay vì địa chỉ của bên thứ ba như là người nhận hoá đơn
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa trả
 ShowUnpaidLateOnly=Hiển thị chỉ hoá đơn chưa trả cuối
 PaymentInvoiceRef=Hóa đơn thanh toán %s
@@ -474,21 +476,22 @@ Reported=Bị trễ
 DisabledBecausePayments=Không được khi có nhiều khoản thanh toán
 CantRemovePaymentWithOneInvoicePaid=Không thể xóa bỏ thanh toán khi có ít nhất một hóa đơn được phân loại đã trả
 ExpectedToPay=Thanh toán dự kiến
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Đã trả bởi khoản thanh toán này
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Phân loại các "Đã trả" tất cả các giấy báo có đã trả đủ trở lại.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn chưa trả sẽ được tự động đóng sang trạng thái "Đã trả".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Trả
 ToMakePaymentBack=Trả lại
 ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa trả
 NoteListOfYourUnpaidInvoices=Ghi chú: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn liên quan như là một đại diện bán hàng.
 RevenueStamp=Doanh thu đóng dấu
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Quay về số với định dạng %ssyymm-nnnn cho hóa đơn chuẩn và %syymm-nnnn cho các giấy báo có nơi mà yy là năm, mm là tháng và nnnn là một chuỗi ngắt và không trở về 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Xóa hóa đơn mẫu
 ConfirmDeleteRepeatableInvoice=Bạn có chắc chắn muốn xóa hóa đơn mẫu?
 CreateOneBillByThird=Tạo 1 hóa đơn theo tổ chức (hoặc, 1 hóa đơn theo đơn hàng)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index 67cacc8fc12..b002ef35cd6 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=Hiện công ty
 ShowStock=Hiện kho
 DeleteArticle=Nhấn vào đây để gỡ bỏ bài viết này
 FilterRefOrLabelOrBC=Tìm kiếm (Ref / Label)
-UserNeedPermissionToEditStockToUsePos=Bạn yêu cầu để giảm chứng khoán vào việc tạo ra hóa đơn, vì vậy người dùng có sử dụng POS cần phải có sự cho phép để chỉnh sửa chứng khoán.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Điểm bán hàng
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index 618167645e7..604365fec6f 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=Gọi điện thoại
 ActionAC_FAX=Gửi fax
 ActionAC_PROP=Gửi đơn hàng đề xuất qua thư
 ActionAC_EMAIL=Gởi thư
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=Cuộc họp
 ActionAC_INT=Intervention on site
 ActionAC_FAC=Gửi hóa đơn khách hàng bằng thư
@@ -72,8 +73,8 @@ StatusProsp=Trạng thái KH tiềm năng
 DraftPropals=Dự thảo đơn hàng đề xuất
 NoLimit=No limit
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/vi_VN/dict.lang b/htdocs/langs/vi_VN/dict.lang
index 9ae85913a6b..c1cafab6419 100644
--- a/htdocs/langs/vi_VN/dict.lang
+++ b/htdocs/langs/vi_VN/dict.lang
@@ -116,7 +116,7 @@ CountryHM=Đảo Heard và McDonald
 CountryVA=Tòa Thánh (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hồng Kông
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=Ấn Độ
 CountryID=Indonesia
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Bắc Triều Tiên
 CountryKR=Hàn Quốc
 CountryKW=Kuwait
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=Lào
 CountryLV=Latvia
 CountryLB=Lebanon
@@ -160,7 +160,7 @@ CountryMD=Moldova
 CountryMN=Mông Cổ
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Birmania (Myanmar)
+CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad và Tobago
 CountryTR=Thổ Nhĩ Kỳ
 CountryTM=Turkmenistan
-CountryTC=Quần đảo Turks và Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukraina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Rupee Mauritius
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Krones Na Uy
-CurrencySingNOK=Krone Na Uy
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=Dinar Tunisia
 CurrencySingTND=Dinar Tunisia
 CurrencyUSD=Đô la Mỹ
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=Truyền miệng
 DemandReasonTypeSRC_PARTNER=Đối tác
 DemandReasonTypeSRC_EMPLOYEE=Nhân viên
 DemandReasonTypeSRC_SPONSORING=Tài trợ
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=Định dạng 4A0
 PaperFormatEU2A0=Định dạng 2A0
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index e61c4097892..2fa6698265a 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb các tài liệu trong thư mục
+ECMNbOfDocs=No. of documents in directory
 ECMSection=Thư mục
-ECMSectionManual=Hướng dẫn sử dụng thư mục
+ECMSectionManual=Thư mục
 ECMSectionAuto=Thư mục tự động
-ECMSectionsManual=Hướng dẫn sử dụng cây
+ECMSectionsManual=Cây thư mục
 ECMSectionsAuto=Cây tự động
 ECMSections=Thư mục
-ECMRoot=ECM Root
+ECMRoot=Gốc
 ECMNewSection=Thư mục mới
 ECMAddSection=Thêm thư mục
 ECMCreationDate=Ngày tạo
@@ -14,11 +14,11 @@ ECMNbOfFilesInDir=Số lượng hồ sơ trong thư mục
 ECMNbOfSubDir=Số thư mục con
 ECMNbOfFilesInSubDir=Số ảnh trong thư mục con
 ECMCreationUser=Người tạo
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Vùng DMS/ECM
+ECMAreaDesc=Vùng DMS/ECM (Document Management System / Electronic Content Management) cho phép bạn lưu, chia sẻ và tìm nhanh mọi loại tài liệu trong hệ thống.
 ECMAreaDesc2=* Thư mục tự động được điền tự động khi thêm tài liệu từ thẻ của một phần tử. <br> * Hướng dẫn sử dụng các thư mục có thể được sử dụng để lưu các tài liệu không liên quan đến một yếu tố cụ thể.
 ECMSectionWasRemoved=Thư <b>mục% s</b> đã bị xóa.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Thư mục <b>%s</b> đã được tạo
 ECMSearchByKeywords=Tìm kiếm theo từ khóa
 ECMSearchByEntity=Tìm kiếm theo đối tượng
 ECMSectionOfDocuments=Thư mục tài liệu
@@ -31,9 +31,11 @@ ECMDocsByContracts=Các tài liệu liên quan đến hợp đồng
 ECMDocsByInvoices=Các tài liệu liên quan đến hoá đơn cho khách hàng
 ECMDocsByProducts=Các tài liệu liên quan đến sản phẩm
 ECMDocsByProjects=Các tài liệu liên quan đến dự án
-ECMDocsByUsers=Documents linked to users
+ECMDocsByUsers=Tài liệu liên kết với người dùng
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Không có thư mục được tạo ra
 ShowECMSection=Hiện thư mục
 DeleteSection=Hủy bỏ thư mục
@@ -46,6 +48,5 @@ ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
 NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index fa1048fd020..0b2b27ffb6e 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
diff --git a/htdocs/langs/vi_VN/help.lang b/htdocs/langs/vi_VN/help.lang
index 215cf3ee8a5..774e153632a 100644
--- a/htdocs/langs/vi_VN/help.lang
+++ b/htdocs/langs/vi_VN/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=Trực tuyến thời gian thực / hỗ trợ từ xa
 OtherSupport=Hỗ trợ khác
 ToSeeListOfAvailableRessources=Để liên hệ / xem các nguồn lực có sẵn:
 HelpCenter=Trung tâm trợ giúp
-DolibarrHelpCenter=Dolibarr trợ giúp và trung tâm hỗ trợ
-ToGoBackToDolibarr=Nếu không, bấm <a href="%s">vào đây để sử dụng Dolibarr</a>
-TypeOfSupport=Nguồn hỗ trợ
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=Cộng đồng (miễn phí)
 TypeSupportCommercial=Thương mại
 TypeOfHelp=Loại
@@ -15,12 +15,9 @@ NeedHelpCenter=Need help or support?
 Efficiency=Hiệu quả
 TypeHelpOnly=Chỉ giúp
 TypeHelpDev=Trợ giúp + Phát triển
-TypeHelpDevForm=Trợ giúp phát triển + + hình thành
-ToGetHelpGoOnSparkAngels1=Một số công ty có thể cung cấp một hỗ trợ trực tuyến nhanh chóng (đôi khi ngay lập tức) và hiệu quả hơn bằng cách kiểm soát máy tính của bạn. Giúp đỡ này có thể được tìm thấy trên trang <b>web% s:</b>
-ToGetHelpGoOnSparkAngels3=Bạn cũng có thể vào danh sách của tất cả các huấn luyện viên cho Dolibarr, cho điều này bấm vào nút
-ToGetHelpGoOnSparkAngels2=Đôi khi, không có công ty có sẵn tại thời điểm bạn thực hiện tìm kiếm của bạn, vì vậy suy nghĩ để thay đổi bộ lọc để tìm kiếm "tất cả sẵn sàng". Bạn sẽ có thể gửi nhiều yêu cầu.
-BackToHelpCenter=Nếu không, bấm vào đây để đi <a href="%s">lại để giúp trang chủ trung tâm</a> .
-LinkToGoldMember=Bạn có thể gọi một trong những huấn luyện viên chọn trước bởi Dolibarr cho ngôn ngữ (% s) bằng cách nhấp vào Widget của mình (tình trạng và giá tối đa sẽ được tự động cập nhật):
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=Ngôn ngữ được hỗ trợ
-SubscribeToFoundation=Giúp dự án Dolibarr, đăng ký với cơ sở
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=Để được hỗ trợ Dolibarr chính thức ngôn ngữ của bạn: <br> <a href="%s" target="_blank"><b>% S</b></a>
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index 42239163d7b..62016f65eb3 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Nghỉ phép
-CPTitreMenu=Nghỉ phép
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Báo cáo hàng tháng
 MenuAddCP=Xin nghỉ phép
-NotActiveModCP=Bạn phải kích hoạt mô đun nghỉ phép để xem trang này.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Tạo một yêu cầu nghỉ phép
 DateDebCP=Ngày bắt đầu
 DateFinCP=Ngày kết thúc
@@ -15,13 +15,18 @@ ApprovedCP=Đã phê duyệt
 CancelCP=Đã hủy
 RefuseCP=Bị từ chối
 ValidatorCP=Người duyệt
-ListeCP=Danh sách nghỉ phép
+ListeCP=List of leave
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Mô tả
 SendRequestCP=Tạo yêu cầu nghỉ phép
 DelayToRequestCP=Để lại yêu cầu phải được thực hiện vào <b>ngày</b> thứ nhất <b>là% s (s)</b> trước họ.
-MenuConfCP=Số ngày nghỉ còn lại
-SoldeCPUser=Nghỉ phép số dư <b>là% s</b> ngày.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=Bạn phải chọn ngày kết thúc lớn hơn ngày bắt đầu.
 ErrorSQLCreateCP=Đã xảy ra lỗi SQL trong quá trình tạo:
 ErrorIDFicheCP=Một lỗi đã xảy ra, yêu cầu nghỉ phép không tồn tại.
@@ -30,7 +35,14 @@ ErrorUserViewCP=Bạn không được cấp phép để xem yêu cầu nghỉ ph
 InfosWorkflowCP=Thông tin Quy trình làm việc
 RequestByCP=Theo yêu cầu của
 TitreRequestCP=Yêu cầu rời
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Số ngày nghỉ tiêu thụ
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Chỉnh sửa
 DeleteCP=Xóa
 ActionRefuseCP=Từ chối
@@ -59,6 +71,7 @@ DateRefusCP=Ngày từ chối
 DateCancelCP=Ngày hủy
 DefineEventUserCP=Chỉ định một nghỉ phép đặc biệt cho người sử dụng
 addEventToUserCP=Chỉ định nghỉ
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Lý do
 UserCP=Người dùng
 ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt.
@@ -81,10 +94,15 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Cập nhật thành công.
 Module27130Name= Quản lý các yêu cầu nghỉ
 Module27130Desc= Quản lý các yêu cầu nghỉ phép
@@ -94,7 +112,7 @@ NoticePeriod=Kỳ thông báo
 HolidaysToValidate=Xác nhận yêu cầu nghỉ phép
 HolidaysToValidateBody=Dưới đây là một yêu cầu nghỉ việc để xác nhận
 HolidaysToValidateDelay=Yêu cầu nghỉ phép này sẽ diễn ra trong một thời gian ít hơn% s ngày.
-HolidaysToValidateAlertSolde=Người dùng đã thực hiện điều này để lại reques không có đủ ngày có sẵn.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Yêu cầu xác nhận nghỉ
 HolidaysValidatedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được xác nhận.
 HolidaysRefused=Yêu cầu bị từ chối
@@ -103,4 +121,9 @@ HolidaysCanceled=Yêu cầu hủy bỏ nghỉ phép
 HolidaysCanceledBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được hủy bỏ.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=Chưa địn nghĩa hình thức nghỉ phép để có thể theo dõi số lượng ngày nghỉ
-GoIntoDictionaryHolidayTypes=Vào <strong>Trang chủ - Thiết lập - Từ điển - Hình thức nghỉ phép</strong> để thiết lập các hình thức nghỉ phép khác nhau.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 6da0d52f3a7..a7108cf8f27 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=Chỉ cần làm theo các hướng dẫn từng bước.
 MiscellaneousChecks=Điều kiện tiên quyết kiểm tra
 ConfFileExists=Cấu hình tập tin <b>%s</b> tồn tại.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin <b>%s</b> không tồn tại và không thể được tạo ra!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Cấu hình tập tin <b>%s</b> có thể được tạo ra.
-ConfFileIsNotWritable=Tập tin cấu hình <b>%s</b> là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Tập tin cấu hình <b>%s</b> có thể ghi.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Cập nhật lại thông tin từ tập tin cấu hình.
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP này hỗ trợ phiên.
 PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET.
-PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra <b>variables_order</b> tham số của bạn trong php.ini.
-PHPSupportGD=Điều này hỗ trợ PHP GD chức năng đồ họa.
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=PHP hỗ trợ chức năng này UTF8.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b>. Điều này là đủ.
-PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b> byte. Điều này cần được quá thấp. Thay đổi <b>php.ini</b> của bạn để thiết lập thông số <b>memory_limit</b> ít nhất <b>%s</b> byte.
-Recheck=Nhấn vào đây để kiểm tra significative hơn
-ErrorPHPDoesNotSupportSessions=Cài đặt PHP của bạn không hỗ trợ phiên. Tính năng này là cần thiết để làm cho Dolibarr làm việc. Kiểm tra thiết lập PHP của bạn.
-ErrorPHPDoesNotSupportGD=Cài đặt PHP của bạn không hỗ trợ chức năng đồ họa GD. Không có đồ thị sẽ có sẵn.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ chức năng UTF8. Dolibarr không thể làm việc một cách chính xác. Giải quyết này trước khi cài đặt Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=Thư mục %s không tồn tại.
-ErrorGoBackAndCorrectParameters=Tới lạc hậu và chính xác các thông số sai.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '%s'.
 ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '%s'.
 ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '%s'.
 ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (%s) quá già. Phiên bản %s hoặc cao hơn là cần thiết.
 ErrorPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản %s là bắt buộc.
-ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '%s'.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '%s' đã tồn tại.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Nếu cơ sở dữ liệu không tồn tại, quay trở lại và kiểm tra tùy chọn "Tạo cơ sở dữ liệu".
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Nếu cơ sở dữ liệu đã tồn tại, quay trở lại và bỏ chọn "Tạo cơ sở dữ liệu" tùy chọn.
-WarningBrowserTooOld=Quá phiên bản cũ của trình duyệt. Nâng cấp trình duyệt của bạn đến một phiên bản mới của trình duyệt Firefox, Chrome hay Opera là rất recommanded.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=Phiên bản PHP
 License=Sử dụng giấy phép
 ConfigurationFile=Tập tin cấu hình
@@ -45,22 +45,23 @@ DolibarrDatabase=Cơ sở dữ liệu Dolibarr
 DatabaseType=Loại cơ sở dữ liệu
 DriverType=Loại điều khiển
 Server=Máy chủ
-ServerAddressDescription=Tên tài khoản hoặc địa chỉ ip cho máy chủ cơ sở dữ liệu, thường là 'localhost' khi máy chủ cơ sở dữ liệu được lưu trữ trên cùng một máy chủ hơn so với máy chủ web
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Cổng máy chủ cơ sở dữ liệu. Giữ sản phẩm nào nếu chưa biết.
 DatabaseServer=Máy chủ cơ sở dữ liệu
 DatabaseName=Tên cơ sở dữ liệu
-DatabasePrefix=Bảng cơ sở dữ liệu tiền tố
-AdminLogin=Đăng nhập cho chủ sở hữu cơ sở dữ liệu Dolibarr.
-PasswordAgain=Nhập lại mật khẩu một lần thứ hai
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=Mật khẩu cho chủ sở hữu cơ sở dữ liệu Dolibarr.
 CreateDatabase=Tạo cơ sở dữ liệu
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Máy chủ cơ sở dữ liệu - truy cập superuser
-CheckToCreateDatabase=Kiểm tra hộp nếu cơ sở dữ liệu không tồn tại và phải được tạo ra. <br> Trong trường hợp này, bạn phải điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=Đăng nhập của người dùng được phép để tạo ra cơ sở dữ liệu mới hoặc người dùng mới, bắt buộc nếu cơ sở dữ liệu của bạn hoặc chủ sở hữu của nó không đã tồn tại.
-KeepEmptyIfNoPassword=Để trống nếu người dùng không có mật khẩu (tránh điều này)
-SaveConfigurationFile=Lưu giá trị
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=Kết nối máy chủ
 DatabaseCreation=Tạo ra cơ sở dữ liệu
 CreateDatabaseObjects=Cơ sở dữ liệu đối tượng sáng tạo
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=Tạo các phím nước ngoài và các chỉ số cho
 OtherKeysCreation=Phím và chỉ số nước ngoài tạo
 FunctionsCreation=Chức năng sáng tạo
 AdminAccountCreation=Tạo đăng nhập quản trị
-PleaseTypePassword=Xin vui lòng nhập một mật khẩu, mật khẩu rỗng không được phép!
-PleaseTypeALogin=Xin vui lòng nhập một tên đăng nhập!
-PasswordsMismatch=Có khác nhau mật khẩu, hãy thử lại!
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=Kết thúc cài đặt
 SystemIsInstalled=Cài đặt này hoàn tất.
 SystemIsUpgraded=Dolibarr đã được nâng cấp thành công.
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=Bạn cần phải cấu hình cho phù hợp với nh
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Tới Dolibarr
 GoToSetupArea=Tới Dolibarr (setup)
-MigrationNotFinished=Phiên bản cơ sở dữ liệu của bạn không phải là hoàn toàn cập nhật, vì vậy bạn sẽ phải chạy quá trình nâng cấp một lần nữa.
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Tới nâng cấp trang lại
 WithNoSlashAtTheEnd=Nếu không có các dấu gạch chéo "/" ở cuối
-DirectoryRecommendation=Nó được recommanded sử dụng một thư mục bên ngoài thư mục của bạn của trang web của bạn.
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=Đã tồn tại
 DolibarrAdminLogin=Dolibarr quản trị đăng nhập
-AdminLoginAlreadyExists=Dolibarr tài khoản quản trị '<b>%s</b>' đã tồn tại. Quay trở lại, nếu bạn muốn tạo một số khác.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Cảnh báo, vì lý do bảo mật, một khi cài đặt hoặc nâng cấp hoàn thành, để tránh sử dụng các công cụ cài đặt một lần nữa, bạn nên thêm một tập tin gọi là <b>install.lock</b> vào thư mục tài liệu Dolibarr, để tránh việc sử dụng độc hại của nó.
-FunctionNotAvailableInThisPHP=Không có sẵn trên PHP này
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Chọn kịch bản di cư
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Xử lý kịch bản
 ChooseYourSetupMode=Chọn chế độ cài đặt của bạn và bấm vào nút "Bắt đầu" ...
 FreshInstall=Cài đặt mới
-FreshInstallDesc=Sử dụng chế độ này nếu điều này là cài đặt đầu tiên của bạn. Nếu không, chế độ này có thể sửa chữa cài đặt trước đó không đầy đủ, nhưng nếu bạn muốn nâng cấp phiên bản của bạn, chọn "Nâng cấp" chế độ.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Nâng cấp
 UpgradeDesc=Sử dụng chế độ này nếu bạn đã thay thế các tập tin Dolibarr cũ với các tập tin từ một phiên bản mới hơn. Điều này sẽ nâng cấp cơ sở dữ liệu và dữ liệu của bạn.
 Start=Bắt đầu
 InstallNotAllowed=Thiết lập không cho phép quyền <b>conf.php</b>
 YouMustCreateWithPermission=Bạn phải tạo tập tin% s và cho phép ghi vào nó cho máy chủ web trong quá trình cài đặt.
-CorrectProblemAndReloadPage=Hãy khắc phục vấn đề và bấm F5 để tải lại trang.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=Đã di cư
 DatabaseVersion=Phiên bản cơ sở dữ liệu
 ServerVersion=Phiên bản máy chủ cơ sở dữ liệu
 YouMustCreateItAndAllowServerToWrite=Bạn phải tạo thư mục này và cho phép các máy chủ web để viết vào đó.
 DBSortingCollation=Nhân vật thứ tự sắp xếp
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu <b>%s</b>, nhưng cho điều này, Dolibarr cần kết nối với máy chủ <b>%s</b> với quyền super user <b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng nhập <b>%s</b>,</b> nhưng cho điều này, Dolibarr cần kết nối với máy chủ <b>%s</b> với quyền super user <b>%s</b>.
-BecauseConnectionFailedParametersMayBeWrong=Khi kết nối thành công, máy chủ hoặc người sử dụng siêu thông số phải là sai.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Trẻ em mồ côi thanh toán được phát hiện bằng phương pháp% s
 RemoveItManuallyAndPressF5ToContinue=Loại bỏ nó bằng tay và bấm F5 để tiếp tục.
 FieldRenamed=Dòng đổi tên
-IfLoginDoesNotExistsCheckCreateUser=Nếu đăng nhập không tồn tại được nêu ra, bạn phải kiểm tra tùy chọn "Tạo người dùng"
-ErrorConnection=Server "<b>%s</b>" tên cơ sở dữ liệu "<b>%s</b>" đăng nhập "<b>%s</b>" hoặc mật khẩu cơ sở dữ liệu có thể sai hoặc phiên bản client PHP có thể là quá cũ so với phiên bản cơ sở dữ liệu.
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=Đề nghị lựa chọn để cài đặt phiên bản <b>%s</b> từ phiên bản hiện tại của bạn <b>%s</b>
 InstallChoiceSuggested=<b>Cài đặt lựa chọn được đề xuất bởi trình cài đặt.</b>
-MigrateIsDoneStepByStep=Phiên bản mục tiêu (%s) có một khoảng cách của một số phiên bản, vì vậy cài đặt chương trình sẽ trở lại với đề nghị di chuyển tiếp theo lần này sẽ được hoàn thành.
-CheckThatDatabasenameIsCorrect=Kiểm tra xem tên "<b>%s</b>" cơ sở dữ liệu là chính xác.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=Nếu tên này là chính xác và cơ sở dữ liệu chưa tồn tại, bạn phải kiểm tra tùy chọn "Tạo cơ sở dữ liệu".
 OpenBaseDir=PHP openbasedir tham số
-YouAskToCreateDatabaseSoRootRequired=Bạn đã chọn hộp "Tạo cơ sở dữ liệu". Đối với điều này, bạn cần cung cấp tên đăng nhập / mật khẩu của siêu người dùng (dưới cùng của mẫu).
-YouAskToCreateDatabaseUserSoRootRequired=Bạn đã chọn hộp "Tạo chủ sở hữu cơ sở dữ liệu". Đối với điều này, bạn cần cung cấp tên đăng nhập / mật khẩu của siêu người dùng (dưới cùng của mẫu).
-NextStepMightLastALongTime=Bước hiện tại có thể kéo dài vài phút. Hãy đợi cho đến khi màn hình tiếp theo được thể hiện hoàn toàn trước khi tiếp tục.
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=Di chuyển vận chuyển cho các đơn đặt hàng của khách hàng lưu trữ
 MigrationShippingDelivery=Nâng cấp lưu trữ vận chuyển
 MigrationShippingDelivery2=Nâng cấp lưu trữ vận chuyển 2
 MigrationFinished=Di cư đã hoàn thành
-LastStepDesc=<strong>Bước cuối cùng:</strong> Xác định đây đăng nhập và mật khẩu bạn có kế hoạch sử dụng để kết nối với phần mềm. Đừng mất này vì nó là tài khoản để quản lý tất cả những người khác.
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Kích hoạt module %s
 ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
-KeepDefaultValuesWamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ DoliWamp, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm.
-KeepDefaultValuesDeb=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một gói phần mềm Linux (Ubuntu, Debian, Fedora ...), do đó giá trị đề xuất ở đây đã được tối ưu hóa. Chỉ có mật khẩu của chủ sở hữu cơ sở dữ liệu để tạo ra phải được hoàn tất. Thay đổi các thông số khác chỉ khi bạn biết những gì bạn làm.
-KeepDefaultValuesMamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ DoliMamp, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm.
-KeepDefaultValuesProxmox=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một thiết bị ảo Proxmox, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Di chuyển dữ liệu cho đề xuất thương mại
 MigrationInvoice=Di chuyển dữ liệu cho hóa đơn của khách hàng
 MigrationContract=Di chuyển dữ liệu cho các hợp đồng
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Nâng cấp thành công
 MigrationUpdateFailed=Quá trình nâng cấp thất bại
 MigrationRelationshipTables=Di chuyển dữ liệu cho các bảng mối quan hệ (%s)
 MigrationPaymentsUpdate=Chỉnh sửa dữ liệu thanh toán
@@ -163,9 +164,9 @@ MigrationContractsUpdate=Hợp đồng sửa chữa dữ liệu
 MigrationContractsNumberToUpdate=Hợp đồng %s (các) để cập nhật
 MigrationContractsLineCreation=Tạo dòng hợp đồng cho hợp đồng ref %s
 MigrationContractsNothingToUpdate=Không có những thứ nhiều hơn để làm
-MigrationContractsFieldDontExist=Dòng fk_facture không tồn tại nữa. Không có gì để làm.
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Hợp đồng sửa chữa ngày rỗng
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=Không có hợp đồng ngày trống để sửa chữa
 MigrationContractsEmptyCreationDatesNothingToUpdate=Không có ngày tạo lập hợp đồng để sửa chữa
 MigrationContractsInvalidDatesUpdate=Điều chỉnh hợp đồng ngày giá trị xấu
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=Cập nhật Giao hàng tận nơi
 MigrationStockDetail=Cập nhật giá trị cổ phiếu của sản phẩm
 MigrationMenusDetail=Cập nhật bảng menu động
 MigrationDeliveryAddress=Cập nhật địa chỉ giao hàng trong lô hàng
-MigrationProjectTaskActors=Di chuyển dữ liệu cho bảng llx_projet_task_actors
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Di chuyển dữ liệu lĩnh vực fk_user_resp của llx_projet để llx_element_contact
 MigrationProjectTaskTime=Cập nhật dành thời gian trong vài giây
 MigrationActioncommElement=Cập nhật dữ liệu về các hoạt động
 MigrationPaymentMode=Di chuyển dữ liệu cho phương thức thanh toán
 MigrationCategorieAssociation=Di chuyển các loại
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Hiển thị tùy chọn không có sẵn
-HideNotAvailableOptions=Ẩn các tùy chọn không có sẵn
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 1e7e0aad3c0..b3a80cd0cae 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=Liên lạc cho bên thứ ba này
 ContactsAddressesForCompany=Liên lạc/địa chỉ cho bên thứ ba này
 AddressesForCompany=Địa chỉ cho bên thứ ba này
 ActionsOnCompany=Sự kiện về bên thứ ba này
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=Sự kiện về thành viên này
 ActionsOnProduct=Events about this product
 NActionsLate=%s cuối
@@ -847,9 +848,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Báo cáo chi tiêu
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index fcbc3c0491c..ba88771511a 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -83,6 +83,7 @@ LinkedObject=Đối tượng liên quan
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Tiêu đề
 WEBSITE_DESCRIPTION=Mô tả
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/vi_VN/paybox.lang b/htdocs/langs/vi_VN/paybox.lang
index 3f05b90e54e..2837a47f8b4 100644
--- a/htdocs/langs/vi_VN/paybox.lang
+++ b/htdocs/langs/vi_VN/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user inte
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index 02f23259285..8a55e33ed76 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=Đã ký (cần ra hóa đơn)
 PropalStatusNotSigned=Không ký (đã đóng)
 PropalStatusBilled=Đã ra hóa đơn
 PropalStatusDraftShort=Dự thảo
-PropalStatusValidatedShort=Đã xác nhận
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=Đã đóng
 PropalStatusSignedShort=Đã ký
 PropalStatusNotSignedShort=Không ký
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Đơn hàng đề xuất %s không tìm thấy
 AddToDraftProposals=Thêm vào dự thảo đề xuất
 NoDraftProposals=Không có đề xuất dự thảo
 CopyPropalFrom=Tạo đơn hàng đề xuất bằng cách sao chép đề nghị hiện tại
-CreateEmptyPropal=Tạo đơn hàng đề xuất trống hoặc từ danh sách các sản phẩm / dịch vụ
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=Thời gian hiệu lực mặc định của đơn hàng đề xuất (theo ngày)
-UseCustomerContactAsPropalRecipientIfExist=Dùng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ người nhận đơn hàng đề xuất
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=Sao chép đơn hàng đề xuất
 ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=Liên hệ với khách hàng sau-up đề
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=Một mô hình đề xuất đầy đủ (logo ...)
+DocModelCyanDescription=Một mô hình đề xuất đầy đủ (logo ...)
 DefaultModelPropalCreate=Tạo mô hình mặc định
 DefaultModelPropalToBill=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (được lập hoá đơn)
 DefaultModelPropalClosed=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (chưa lập hoá đơn)
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index c5ec67f23bc..d25bdbd99ed 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Mã
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Đọc
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 1c38c33012c..5f71767b1a5 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=功能在演示版中已禁用
 FeatureAvailableOnlyOnStable=功能仅适用于官方稳定版本
 BoxesDesc=资讯框是一些页面中显示信息的屏幕区域。你可以选择目标页面并点击“启用”或垃圾桶按钮来显示或禁用这些信息域。
 OnlyActiveElementsAreShown=仅显示 <a href="%s">已启用模块</a> 的元素。
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=你能在外部互联网查找到并下载更多的功能模块...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=更多模块...
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=多模块工具
 ModuleFamilyExperimental=试验性模块
 ModuleFamilyFinancial=财务模块(会计/金库)
 ModuleFamilyECM=电子文档管理(ECM)
-ModuleFamilyPortal=网页和其他前端应用
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=系统外部扩展接口
 MenuHandlers=菜单处理程序
 MenuAdmin=菜单编辑器
@@ -463,9 +463,9 @@ ClickToShowDescription=单击以显示说明
 DependsOn=This module needs the module(s)
 RequiredBy=本模块被以下模块需要
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>对于表单来创建新的合作方，它是<strong> %s </strong>，<br>如果你想要以url参数为默认值，你可以使用<strong> %s </strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=启用个性化默认值的使用
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=用户和组
 Module0Desc=用户/员工和组管理
 Module1Name=Third Parties
-Module1Desc=公司和联络人管理(客户、准客户潜在客户...等等)模块
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=商业交易
 Module2Desc=交易管理
 Module10Name=会计
@@ -501,7 +501,7 @@ Module23Desc=能耗监测
 Module25Name=销售订单
 Module25Desc=销售订单管理
 Module30Name=发票
-Module30Desc=客户发票和信用记录管理。供应商发票管理。
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=供应商
 Module40Desc=供应商和采购管理（采购订单和账单）
 Module42Name=调试日志
@@ -902,7 +902,7 @@ DictionaryVAT=增值税率和消费税率
 DictionaryRevenueStamp=税票金额
 DictionaryPaymentConditions=付款条件
 DictionaryPaymentModes=付款方式
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=网站页面/容器的类型
 DictionaryEcotaxe=Ecotax 指令
 DictionaryPaperFormat=纸张格式
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=地税报表是销售总计
 LabelUsedByDefault=如果代码没有翻译则默认使用以下标签
 LabelOnDocuments=文档中的标签
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=月末
 CurrentNext=当前/下一项
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=安全稽核事件
-Audit=安全稽核
+Audit=Security events
 InfoDolibarr=关于Dolibarr
 InfoBrowser=关于浏览器
 InfoOS=关于OS
@@ -1065,7 +1066,7 @@ BrowserName=浏览器名称
 BrowserOS=浏览器操作系统
 ListOfSecurityEvents=安全事件清单
 SecurityEventsPurged=安全事件清除
-LogEventDesc=这里您可以启用 Dolibarr 的安全事件日志记录。管理员可以通过<b>“系统工具”-“稽核”</b>查看其内容。警告，此功能会消耗大量的数据库空间。
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=此功能仅供<b>管理员用户</b> 使用。
 SystemInfoDesc=系统信息指以只读方式显示的其它技术信息，只对系统管理员可见。
 SystemAreaForAdminOnly=此区仅供管理员用户使用。Dolibarr 中没有权限可越过此限制。
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=舍入范围的步骤（对于在除了基数10之外的
 UnitPriceOfProduct=税前单价
 TotalPriceAfterRounding=四舍五入后的总价 (税前价/增值税/税后价)
 ParameterActiveForNextInputOnly=参数仅在下次输入数值起生效。
-NoEventOrNoAuditSetup=尚无安全事件被记录。“设置 - 安全 - 稽核”页面的稽核功能未启用则属于正常现象。
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=参见您的本机 sendmail 设置
 BackupDesc=为了生成一个完整的 Dolibarr 备份，你必须：
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=补充属性（模板发票行）
 ExtraFieldsSupplierOrdersLines=补充属性（订单行）
 ExtraFieldsSupplierInvoicesLines=自定义属性(发票明细)
 ExtraFieldsThirdParties=自定义属性 (合作方)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=自定义属性 (会员)
 ExtraFieldsMemberType=自定义属性 (会员类型)
 ExtraFieldsCustomerInvoices=自定义属性(发票)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=每个用户的通知列表*
 ListOfNotificationsPerUserOrContact=每个用户*或每个联系人的通知列表**
 ListOfFixedNotifications=固定通知列表
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=转到合作方的“通知”标签，添加或删除联系人/地址的通知
 Threshold=阈值
 BackupDumpWizard=数据库转储备份向导
 SomethingMakeInstallFromWebNotPossible=由于以下原因，无法从Web界面安装外部模块：
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=邮编
 ##### Resource ####
 ResourceSetup=配置模块资源
 UseSearchToSelectResource=使用搜索表单选择资源（而不是下拉列表）。
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index bdf90957a3b..59880dcd7f5 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=银行
-MenuBankCash=Bank | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuBankCash=银行|现金
+MenuVariousPayment=杂项付款
+MenuNewVariousPayment=新的杂项付款
 BankName=银行名称
 FinancialAccount=帐户
 BankAccount=银行帐户
 BankAccounts=银行帐户
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=银行|网关
 ShowAccount=显示帐户
 AccountRef=财务帐号
 AccountLabel=财务帐户标签
@@ -31,12 +31,12 @@ Reconciliation=和解
 RIB=银行帐号
 IBAN=IBAN号码
 BIC=的BIC / SWIFT的号码
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct Debit orders
-StandingOrder=Direct debit order
+SwiftValid=BIC / SWIFT有效
+SwiftVNotalid=BIC / SWIFT无效
+IbanValid=BAN有效
+IbanNotValid=BAN无效
+StandingOrders=直接借记订单
+StandingOrder=直接借记订单
 AccountStatement=户口结单
 AccountStatementShort=声明
 AccountStatements=户口结单
@@ -46,7 +46,7 @@ BankAccountDomiciliation=帐户地址
 BankAccountCountry=国家
 BankAccountOwner=帐户持有人姓名
 BankAccountOwnerAddress=帐户持有人地址
-RIBControlError=值的完整性检查失败。这意味着此帐号的信息不完整或错误（检查国家，数字和IBAN）。
+RIBControlError=值的完整性检查失败。这意味着此帐号的信息不完整或不正确（请检查国家/地区，号码和IBAN）。
 CreateAccount=创建帐户
 NewBankAccount=新帐户
 NewFinancialAccount=新建财务账号
@@ -60,42 +60,43 @@ BankType2=现金帐户
 AccountsArea=帐户区
 AccountCard=户口信息
 DeleteAccount=删除帐户
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=您确定要删除此帐户吗？
 Account=帐户
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=银行分类条目
+BankTransactionForCategory=类别<b> %s</b>的银行条目
 RemoveFromRubrique=删除链接分类
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=您确定要删除条目和类别之间的链接吗？
+ListBankTransactions=银行条目清单
 IdTransaction=交易ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+BankTransactions=银行条目
+BankTransaction=银行条目
+ListTransactions=列表条目
+ListTransactionsByCategory=列表条目/类别
+TransactionsToConciliate=调和的条目
 Conciliable=可以两全
 Conciliate=调和
 Conciliation=和解
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=仅保存声明
+ReconciliationLate=调解逾期
 IncludeClosedAccount=包括失效账户
 OnlyOpenedAccount=仅有效账户
 AccountToCredit=帐户信用
 AccountToDebit=帐户转帐
 DisableConciliation=此帐户的禁用和解功能
 ConciliationDisabled=和解功能禁用
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=与调解的条目相关联
 StatusAccountOpened=打开
 StatusAccountClosed=禁用
 AccountIdShort=数字
 LineRecord=交易
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
+AddBankRecord=添加条目
+AddBankRecordLong=手动添加条目
+Conciliated=调解
 ConciliatedBy=由调和
 DateConciliating=核对日期
-BankLineConciliated=Entry reconciled
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=进入调解
+Reconciled=调解
+NotReconciled=未调解
 CustomerInvoicePayment=客户付款
 SupplierInvoicePayment=供应商付款
 SubscriptionPayment=认购款项
@@ -104,26 +105,26 @@ SocialContributionPayment=支付社保/财政税
 BankTransfer=银行转帐
 BankTransfers=银行转帐
 MenuBankInternalTransfer=内部转移
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=从一个帐户转移到另一个帐户，Dolibarr将写两条记录（源帐户中的借记和目标帐户中的贷记）。此交易将使用相同金额（标志除外），标签和日期）
 TransferFrom=从
 TransferTo=至
 TransferFromToDone=从<b>%s</b>向<b>%s</b>转帐<b>%s</b>已被记录。
 CheckTransmitter=发射机
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=验证此支票收据？
+ConfirmValidateCheckReceipt=您确定要验证此支票收据，一旦完成，是否可以进行更改？
+DeleteCheckReceipt=删除此支票收据？
+ConfirmDeleteCheckReceipt=您确定要删除此支票收据吗？
 BankChecks=银行支票
 BankChecksToReceipt=等待支票存款
 ShowCheckReceipt=显示检查存单
 NumberOfCheques=支票数
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+DeleteTransaction=删除条目
+ConfirmDeleteTransaction=您确定要删除此条目吗？
+ThisWillAlsoDeleteBankRecord=这也将删除生成的银行条目
 BankMovements=移动
-PlannedTransactions=Planned entries
+PlannedTransactions=计划的条目
 Graph=图表
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=银行条目和帐户对帐单
 ExportDataset_banque_2=存款单
 TransactionOnTheOtherAccount=交易的其他帐户
 PaymentNumberUpdateSucceeded=款项更新成功
@@ -131,35 +132,37 @@ PaymentNumberUpdateFailed=付款数目无法更新
 PaymentDateUpdateSucceeded=付款日期更新成功
 PaymentDateUpdateFailed=付款日期无法更新
 Transactions=交易
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
+BankTransactionLine=银行条目
+AllAccounts=所有银行和现金账户
 BackToAccount=回到帐户
 ShowAllAccounts=显示所有帐户
-FutureTransaction=在FUTUR的交易。调解没有办法。
-SelectChequeTransactionAndGenerate=选择/筛选检查纳入支票存款收据，并单击“创建”。
+FutureTransaction=未来的交易。无法调和。
+SelectChequeTransactionAndGenerate=选择/过滤支票以包括在支票存款收据中，然后单击“创建”。
 InputReceiptNumber=选择与税率有关的银行声明。 使用一个合适的数值: YYYYMM 或 YYYYMMDD
 EventualyAddCategory=最后，指定一个范畴对其中的记录进行分类
-ToConciliate=To reconcile?
+ToConciliate=调和？
 ThenCheckLinesAndConciliate=然后按一下，连线检查银行对账单。
 DefaultRIB=默认BAN
 AllRIB=全部BAN
 LabelRIB=BAN标签
 NoBANRecord=空空如也——没有BAN记录
 DeleteARib=删除BAN记录
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+ConfirmDeleteRib=您确定要删除此BAN记录吗？
 RejectCheck=退回的支票
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+ConfirmRejectCheck=您确定要将此支票标记为已拒绝吗？
 RejectCheckDate=支票被退回的日期
 CheckRejected=退回的支票
 CheckRejectedAndInvoicesReopened=检查退回发票并重新打开发票
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+BankAccountModelModule=银行账户的文档模板
+DocumentModelSepaMandate=SEPA任务模板。仅适用于欧洲经济共同体的欧洲国家。
+DocumentModelBan=用于打印具有BAN信息的页面的模板。
+NewVariousPayment=新的杂项付款
+VariousPayment=杂项付款
+VariousPayments=杂项付款
+ShowVariousPayment=显示杂项付款
+AddVariousPayment=添加杂项付款
+SEPAMandate=SEPA授权
+YourSEPAMandate=您的SEPA授权
+FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 22dcbab9683..8e0f70bb12c 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=发票
 Bills=发票
-BillsCustomers=客户发票
+BillsCustomers=顾客发票
 BillsCustomer=客户发票
 BillsSuppliers=供应商发票
-BillsCustomersUnpaid=客户未付发票
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaid=未付款顾客发票
+BillsCustomersUnpaidForCompany=%s的未付款顾客发票
 BillsSuppliersUnpaid=未付供应商发票
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=未付款的供应商发票为%s
 BillsLate=逾期付款
 BillsStatistics=客户发票统计
 BillsStatisticsSuppliers=供应商发票统计
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseDispatchedInBookkeeping=已禁用，因为发票已发送到簿记中
+DisabledBecauseNotLastInvoice=禁用，因为发票不可擦除。在此之后记录了一些发票，它将在柜台上创建漏洞。
 DisabledBecauseNotErasable=禁止删除
 InvoiceStandard=标准发票
 InvoiceStandardAsk=标准发票
 InvoiceStandardDesc=这种发票是一种常见的发票。
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDeposit=首付发票
+InvoiceDepositAsk=首付发票
+InvoiceDepositDesc=这种发票是在收到预付款时完成的。
 InvoiceProForma=形式发票
 InvoiceProFormaAsk=形式发票
 InvoiceProFormaDesc=<b>形式发票</b>是发票的形式，但其没有真正的会计价值。
 InvoiceReplacement=更换发票
 InvoiceReplacementAsk=为发票更换发票
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=信用记录
 InvoiceAvoirAsk=更正发票的信用记录
-InvoiceAvoirDesc=<b>信用记录</b>是一个阐述事实的证明，即发票已缴纳的数额相差实在比额（因为顾客错误地多付款，或是因为其归还了部分产品，所以将完全不支付）。
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
+invoiceAvoirWithLines=使用原始发票中的行创建贷方通知单
+invoiceAvoirWithPaymentRestAmount=使用剩余未付原始发票创建贷方通知单
+invoiceAvoirLineWithPaymentRestAmount=剩余未付金额的信用票据
 ReplaceInvoice=替换%s的发票
 ReplacementInvoice=更换发票
 ReplacedByInvoice=被发票 %s 替换
@@ -43,7 +43,7 @@ ConsumedBy=消耗
 NotConsumed=不消耗
 NoReplacableInvoice=没有替换的发票
 NoInvoiceToCorrect=没有发票，以纠正
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=是一个或几个信用票据的来源
 CardBill=发票信息
 PredefinedInvoices=预定义的发票
 Invoice=发票
@@ -62,16 +62,16 @@ PaymentBack=付款
 CustomerInvoicePaymentBack=付款
 Payments=付款
 PaymentsBack=付款
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=在发票货币
 PaidBack=已退款
 DeletePayment=删除付款
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmDeletePayment=您确定要删除此付款吗？
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=供应商付款
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=收到客户付款
-PayedSuppliersPayments=支付给供应商的付款
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=收到需要确认的客户付款
 PaymentsReportsForYear=客户 %s 的付款报告
 PaymentsReports=付款报表
@@ -79,10 +79,10 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=付款已完成
 PaymentRule=付款规则
 PaymentMode=付款方式
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=借记卡/信用卡
 PaymentTypePP=PayPal
 IdPaymentMode=付款方式 (id)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=付款方式（代码）
 LabelPaymentMode=付款方式 (标签)
 PaymentModeShort=付款方式
 PaymentTerm=付款条件
@@ -91,8 +91,8 @@ PaymentConditionsShort=付款条件
 PaymentAmount=付款金额
 ValidatePayment=确认付款
 PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
-HelpPaymentHigherThanReminderToPay=注意，一个或更多的票据付款金额比其他支付更高。 <br>编辑您的进入，否则确认并考虑建立一个每个多缴发票收到超出信用注记。
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=归类为 已支付
 ClassifyPaidPartially=归类分 部分支付
 ClassifyCanceled=归类为 已丢弃
@@ -107,128 +107,130 @@ SearchACustomerInvoice=搜索客户发票
 SearchASupplierInvoice=搜索供应商发票
 CancelBill=取消发票
 SendRemindByMail=通过电子邮件发送提醒
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+DoPayment=输入付款
+DoPaymentBack=输入退款
+ConvertToReduc=标记为可用信用
+ConvertExcessReceivedToReduc=将超出的收入转换为可用信用
+ConvertExcessPaidToReduc=将超额付款转换为可用折扣
 EnterPaymentReceivedFromCustomer=输入从客户收到的付款
 EnterPaymentDueToCustomer=为客户创建付款延迟
 DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
 PriceBase=价格基准
 BillStatus=发票状态
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=生成的发票的状态
 BillStatusDraft=草案(需要确认)
 BillStatusPaid=已支付
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=信用票据退款或标记为可用信用
+BillStatusConverted=付费（准备在最终发票中消费）
 BillStatusCanceled=已丢弃
 BillStatusValidated=已确认 (需要付款)
 BillStatusStarted=开始
 BillStatusNotPaid=未支付
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=没有退款
 BillStatusClosedUnpaid=已关闭 (未支付)
 BillStatusClosedPaidPartially=已支付 (部分)
 BillShortStatusDraft=草稿
 BillShortStatusPaid=已支付
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=已支付
 BillShortStatusCanceled=已丢弃
 BillShortStatusValidated=已确认
 BillShortStatusStarted=开始
 BillShortStatusNotPaid=未支付
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=没有退款
 BillShortStatusClosedUnpaid=禁用
 BillShortStatusClosedPaidPartially=已支付 (部分)
 PaymentStatusToValidShort=需要确认
-ErrorVATIntraNotConfigured=Intracommunautary增值税号码目前尚未定义。
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=没有默认的支付方式定义。前往发票模块设置，以解决这个问题。
 ErrorCreateBankAccount=创建一个银行帐户，然后到安装发票模块小组，确定付款方式
 ErrorBillNotFound=发票%s不存在
-ErrorInvoiceAlreadyReplaced=错误，您尝试验证发票来取代发票%，但是，这一发票已被发票%s取代
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=错误，已经使用优惠
 ErrorInvoiceAvoirMustBeNegative=错误，这种类型的发票必须有一个负数
 ErrorInvoiceOfThisTypeMustBePositive=错误，这种类型的发票必须有一个正数
 ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消一个已经被处于草稿状态发票替代的发票
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=发送方
 BillTo=接收方
 ActionsOnBill=发票的动作
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=模板/重复发票
+NoQualifiedRecurringInvoiceTemplateFound=没有经常生成的模板发票。
+FoundXQualifiedRecurringInvoiceTemplate=找到%s经常生效的模板发票。
+NotARecurringInvoiceTemplate=不是定期模板发票
 NewBill=新建发票
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s supplier template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s supplier invoices
+LastBills=最新的%s发票
+LatestTemplateInvoices=最新的%s模板发票
+LatestCustomerTemplateInvoices=最新的%s顾客临时发票
+LatestSupplierTemplateInvoices=最新的%s供应商模板发票
+LastCustomersBills=最新%s顾客发票
+LastSuppliersBills=最新的%s供应商发票
 AllBills=全部发票
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=所有模板发票
 OtherBills=其他发票
 DraftBills=发票草稿
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Supplier draft invoices
+CustomersDraftInvoices=顾客草稿发票
+SuppliersDraftInvoices=供货商草稿发票
 Unpaid=未付
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmDeleteBill=您确定要删除此发票吗？
+ConfirmValidateBill=您确定要参考<b> %s </b>验证此发票吗？
+ConfirmUnvalidateBill=您确定要将发票<b> %s </b>更改为草稿状态吗？
+ConfirmClassifyPaidBill=您确定要将发票<b> %s </b>更改为已付款状态吗？
+ConfirmCancelBill=你确定要取消发票<b>%s</b>吗 ？
+ConfirmCancelBillQuestion=为什么要将此发票分类为“废弃”？
+ConfirmClassifyPaidPartially=你确定要将发票<b>%s</b>更改为已支付状态吗？
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=剩余未付<b>（%s %s）</b>是一项折扣，因为付款是在期前完成的。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我接受失去这个折扣的增值税。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我在此折扣不恢复信贷注意到增值税。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客
 ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分退回
 ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放弃余额
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=这个选择是可能的，如果您的发票已提供适当的说明。 （例«只有相应的税收已实际支付给权利扣除价格»）
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在一些国家，这种选择是可能的，如果您的发票上只包含正确的说明。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=使用这个选择，如果所有其他不适合
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>糟糕的客户</b>是一个客户，拒绝支付他的债务。
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=这个选择是付款时使用的是不完整的，因为一些产品被退回
-ConfirmClassifyPaidPartiallyReasonOtherDesc=使用这个选择，如果所有其他不适合，例如，在以下情况： <br> - 付款不完整，因为有些产品被运回<br> - 索赔额太重要了，因为忘记了一个折扣<br>在所有情况下，金额逾自称必须在会计系统通过建立一个信用更正说明。
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=这一选择将用于所有的其他情形。例如，因为你要创建一个替代发票。
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ConfirmCustomerPayment=您确认<b> %s </ b> %s的付款输入？
+ConfirmSupplierPayment=你确认这笔<b>%s</b> %s的支付吗？
+ConfirmValidatePayment=您确定要验证此付款吗？付款验证后，无法进行任何更改。
 ValidateBill=确认发票
 UnvalidateBill=取消确认发票
-NumberOfBills=发票数
-NumberOfBillsByMonth=按月发票数
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=发票金额
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=按月发票金额 (税后)
 ShowSocialContribution=显示财政税/增值税
 ShowBill=显示发票
 ShowInvoice=显示发票
 ShowInvoiceReplace=显示替换发票
 ShowInvoiceAvoir=显示信用记录
-ShowInvoiceDeposit=Show down payment invoice
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceDeposit=显示付款发票
+ShowInvoiceSituation=显示情况发票
 ShowPayment=显示支付
 AlreadyPaid=已支付
 AlreadyPaidBack=已支付
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidNoCreditNotesNoDeposits=已经支付（没有信用票据和预付款）
 Abandoned=已丢弃
 RemainderToPay=未付金额
 RemainderToTake=应付金额
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=剩余金额退款
 Rest=待办
 AmountExpected=索赔额
 ExcessReceived=找零
-ExcessPaid=Excess paid
+ExcessPaid=超额付款
 EscompteOffered=折扣额 (付款条件前付款)
 EscompteOfferedShort=折扣
 SendBillRef=发票 %s  的提交
 SendReminderBillRef=发票 %s  的提交 (提醒)
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
+StandingOrders=直接借记订单
+StandingOrder=直接借记订单
 NoDraftBills=没有发票草稿
 NoOtherDraftBills=没有其他发票草稿
 NoDraftInvoices=没有发票草稿
@@ -240,19 +242,19 @@ SendReminderBillByMail=通过电子邮件发送提醒
 RelatedCommercialProposals=相关商业报价
 RelatedRecurringCustomerInvoices=再次关联客户发票
 MenuToValid=需要确认
-DateMaxPayment=Payment due on
+DateMaxPayment=付款到期
 DateInvoice=发票日期
-DatePointOfTax=Point of tax
+DatePointOfTax=税点
 NoInvoice=没有发票
 ClassifyBill=分类发票
 SupplierBillsToPay=未付供应商发票
-CustomerBillsUnpaid=客户未付发票
+CustomerBillsUnpaid=未付款顾客发票
 NonPercuRecuperable=非可收回
 SetConditions=设置付款条件
 SetMode=设置支付方式
 SetRevenuStamp=设置印花税
 Billed=帐单
-RecurringInvoices=Recurring invoices
+RecurringInvoices=定期发票
 RepeatableInvoice=模板发票
 RepeatableInvoices=模板发票
 Repeatable=模板
@@ -260,9 +262,9 @@ Repeatables=模板
 ChangeIntoRepeatableInvoice=转换为模板发票
 CreateRepeatableInvoice=创建模板发票
 CreateFromRepeatableInvoice=从模板发票创建
-CustomersInvoicesAndInvoiceLines=客户发票和发票的路线
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=客户发票和付款
-ExportDataset_invoice_1=客户发票清单和发票的路线
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=客户发票和付款
 ProformaBill=形式发票：
 Reduction=降价
@@ -282,29 +284,29 @@ RelativeDiscount=相对折扣
 GlobalDiscount=全球折扣
 CreditNote=信用记录
 CreditNotes=信用记录
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
+CreditNotesOrExcessReceived=信用票据或超额收到
+Deposit=首付
+Deposits=首付
 DiscountFromCreditNote=从信用记录折扣 %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromDeposit=发票%s的预付款
+DiscountFromExcessReceived=付款超过发票%s
+DiscountFromExcessPaid=付款超过发票%s
 AbsoluteDiscountUse=这种信用值可以在发票被确认前使用
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=必须验证发票才能使用此类信用
 NewGlobalDiscount=新的绝对折扣
 NewRelativeDiscount=新的相对折扣
-DiscountType=Discount type
+DiscountType=折扣类型
 NoteReason=备注/原因
 ReasonDiscount=原因
 DiscountOfferedBy=授予人
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+DiscountStillRemaining=提供折扣或积分
+DiscountAlreadyCounted=已消费的折扣或积分
+CustomerDiscounts=客户折扣
+SupplierDiscounts=供应商折扣
 BillAddress=账单地址
-HelpEscompte=这是给予客户优惠折扣，因为客户在付款条件日期前已经付清全款。
-HelpAbandonBadCustomer=这一数额已被放弃（客户说是一个坏的客户），并作为一个特殊的松散考虑。
-HelpAbandonOther=这一数额已被放弃，因为这是一个错误（错误的顾客或由其他替代例如发票）
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=财政税/增值税代码
 PaymentId=付款编号
 PaymentRef=付款编号
@@ -319,57 +321,57 @@ RemoveDiscount=删除折扣
 WatermarkOnDraftBill=基于发票草稿(无则留空)
 InvoiceNotChecked=没有选取发票
 CloneInvoice=复制发票
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+ConfirmCloneInvoice=你确定要复制发票 <b>%s</b> 吗 ？
 DisabledBecauseReplacedInvoice=发票已经被取代，动作被拒绝
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=付款号码
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=折扣分为两部分
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=输入金额两部分的金额：
-TotalOfTwoDiscountMustEqualsOriginal=两个新的折扣总额必须等于原来折扣金额。
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
+ConfirmRemoveDiscount=您确定要删除此折扣吗？
 RelatedBill=关联发票
 RelatedBills=关联发票
 RelatedCustomerInvoices=关联客户发票
 RelatedSupplierInvoices=关联供应商发票
 LatestRelatedBill=最新关联发票
-WarningBillExist=警告，一个或多个发票已经存在
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=PDF 合并工具
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+AmountPaymentDistributedOnInvoice=付款金额在发票上分配
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=付款备注
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+ListOfPreviousSituationInvoices=以前的情况发票清单
+ListOfNextSituationInvoices=下一个情况发票清单
+ListOfSituationInvoices=情况发票清单
+CurrentSituationTotal=总现状
+DisabledBecauseNotEnouthCreditNote=要从周期中删除情况发票，此发票的贷方通知单总计必须涵盖此发票总额
+RemoveSituationFromCycle=从周期中删除此发票
+ConfirmRemoveSituationFromCycle=从周期中删除此发票%s？
+ConfirmOuting=确认外出
 FrequencyPer_d=每 %s 天
 FrequencyPer_m=每 %s 月
 FrequencyPer_y=每 %s 年
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
+FrequencyUnit=频率单位
+toolTipFrequency=例如:<br /><b>设置 7 / 天</b>: 每 7 天给它一张新发票<br /><b>设置 3 / 个月</b>: 每 3 个月给发一张发票过去
+NextDateToExecution=下一次发票生成的日期
+NextDateToExecutionShort=下一代日期。
+DateLastGeneration=最新一代的日期
+DateLastGenerationShort=最新日期。
+MaxPeriodNumber=最大发票数量
+NbOfGenerationDone=已完成的发票数量
+NbOfGenerationDoneShort=完成的代数
+MaxGenerationReached=达到最大代数
+InvoiceAutoValidate=自动验证发票
+GeneratedFromRecurringInvoice=从模板重复发票%s生成
+DateIsNotEnough=尚未达到日期
+InvoiceGeneratedFromTemplate=从周期性模板发票%s生成的发票%s
+WarningInvoiceDateInFuture=警告，发票日期高于当前日期
+WarningInvoiceDateTooFarInFuture=警告，发票日期与当前日期相差太远
+ViewAvailableGlobalDiscounts=查看可用折扣
 # PaymentConditions
 Statut=状态
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=由于收到
+PaymentConditionRECEP=由于收到
 PaymentConditionShort30D=30天
 PaymentCondition30D=30天
 PaymentConditionShort30DENDMONTH=30天后的那个月底
@@ -384,22 +386,22 @@ PaymentConditionShortPT_ORDER=订单
 PaymentConditionPT_ORDER=在订单
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=预付50%% ，50%%货到后付款
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+PaymentConditionShort10D=10天
+PaymentCondition10D=10天
+PaymentConditionShort10DENDMONTH=月末10天
+PaymentCondition10DENDMONTH=在月底之后的10天内
+PaymentConditionShort14D=14天
+PaymentCondition14D=14天
+PaymentConditionShort14DENDMONTH=月末14天
+PaymentCondition14DENDMONTH=在月底之后的14天内
 FixAmount=固定金额
 VarAmount=可变金额(%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountOneLine=可变金额（%% tot。） -  1行标签'%s'
 # PaymentType
 PaymentTypeVIR=银行转帐
 PaymentTypeShortVIR=银行转帐
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=直接付款订单
+PaymentTypeShortPRE=借记卡付款单
 PaymentTypeLIQ=现金
 PaymentTypeShortLIQ=现金
 PaymentTypeCB=信用卡
@@ -408,19 +410,19 @@ PaymentTypeCHQ=支票
 PaymentTypeShortCHQ=支票
 PaymentTypeTIP=TIP (付款交单)
 PaymentTypeShortTIP=TIP款项
-PaymentTypeVAD=在线支付
-PaymentTypeShortVAD=在线支付
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=银行账单草稿
 PaymentTypeShortTRA=草稿
 PaymentTypeFAC=因素
 PaymentTypeShortFAC=因素
 BankDetails=银行详情
 BankCode=银行代码
-DeskCode=台代码
+DeskCode=Office code
 BankAccountNumber=帐号
-BankAccountNumberKey=关键
+BankAccountNumberKey=Check digits
 Residence=直接借记
-IBANNumber=IBAN号码
+IBANNumber=IBAN complete account number
 IBAN=银行IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT 号码
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=款项转账至以下银行帐户
 VATIsNotUsedForInvoice=* 不得包含增值税, 详见CGI-293B
 LawApplicationPart1=通过对应用的12/05/80法80.335
 LawApplicationPart2=货物仍然是该人士/组织的资产
-LawApplicationPart3=卖方直到完全兑现
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=他们的价格。
 LimitedLiabilityCompanyCapital=有限责任公司（SARL）注册资金
 UseLine=申请
@@ -460,40 +462,41 @@ ChequesReceipts=检查收据
 ChequesArea=支票存款区
 ChequeDeposits=支票存款
 Cheques=支票
-DepositId=Id deposit
-NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=使用客户账单联络方式而不是合伙人的联络方式作为发票的接收人
+DepositId=Id存款
+NbCheque=支票数量
+CreditNoteConvertedIntoDiscount=此%s已被转换为%s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=显示所有未付发票
 ShowUnpaidLateOnly=只显示超时未付发票
 PaymentInvoiceRef=%s的付款发票
 ValidateInvoice=确认发票
-ValidateInvoices=Validate invoices
+ValidateInvoices=验证发票
 Cash=现金
 Reported=延迟
 DisabledBecausePayments=不可操作，因为已经接收了付款
 CantRemovePaymentWithOneInvoicePaid=无法删除，因为至少有一份发票被归类为已支付
 ExpectedToPay=预期付款
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=已由此付款来支付
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=分类“付费”的所有信贷注意到完全支付。
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=全部发票仍然没有支付将被自动关闭状态“支付最高”。
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=支付
 ToMakePaymentBack=支付
 ListOfYourUnpaidInvoices=未付发票清单
-NoteListOfYourUnpaidInvoices=注：此清单只包含链接到您作为一个销售代表的合伙人发票。
+NoteListOfYourUnpaidInvoices=注：此清单只包含链接到指派给您作为销售代表的合作方发票。
 RevenueStamp=印花税票
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
+YouMustCreateStandardInvoiceFirstDesc=您必须先创建标准发票并将其转换为“模板”以创建新模板发票
 PDFCrabeDescription=发票模板Crabe。一个完整的发票模板(支援增值税选项，折扣，付款条件，标识等..)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=发票PDF模板Crevette。情况发票的完整发票模板
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=标准发票的格式为%syymm-nnnn，换发票为%syymm-nnnn，预付款发票为%syymm-nnnn，yy为年份为%syymm-nnnn，mm为月，nnnn为没有中断的序列回到0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=返回编号为标准发票的格式为%syymm-nnnn，信用票据为%syymm-nnnn，yy为年的预付款发票为%syymm-nnnn，mm为月，nnnn为没有中断且不返回0的序列
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=代表跟进客户发票
 TypeContact_facture_external_BILLING=客户发票联络人
@@ -504,45 +507,46 @@ TypeContact_invoice_supplier_external_BILLING=供应商发票联络人
 TypeContact_invoice_supplier_external_SHIPPING=供应商送货联络人
 TypeContact_invoice_supplier_external_SERVICE=供应商服务联络人
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
+InvoiceFirstSituationAsk=第一种情况发票
+InvoiceFirstSituationDesc=<b>现状发票</b>与进展相关的情况有关，例如建筑的进展。每种情况都与发票挂钩。
+InvoiceSituation=情况发票
+InvoiceSituationAsk=根据情况发票
+InvoiceSituationDesc=在已有的情况之后创建新情况
+SituationAmount=情况发票金额（净额）
+SituationDeduction=情况减法
 ModifyAllLines=全部变更
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-situationInvoiceShortcode_AS=AS
+CreateNextSituationInvoice=创建下一个情况
+ErrorFindNextSituationInvoice=错误无法找到下一个情况循环参考
+ErrorOutingSituationInvoiceOnUpdate=无法出租这种情况发票。
+ErrorOutingSituationInvoiceCreditNote=无法外出联系信用票据。
+NotLastInCycle=此发票不是最新的发票，不得修改。
+DisabledBecauseNotLastInCycle=下一种情况已经存在。
+DisabledBecauseFinal=这种情况是最终的。
+situationInvoiceShortcode_AS=如
 situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+CantBeLessThanMinPercent=进展不能小于以前情况下的价值。
+NoSituations=没有开放的情况
+InvoiceSituationLast=最终和一般发票
+PDFCrevetteSituationNumber=情况N°%s
+PDFCrevetteSituationInvoiceLineDecompte=情况发票 -  COUNT
+PDFCrevetteSituationInvoiceTitle=情况发票
+PDFCrevetteSituationInvoiceLine=情况N°%s：Inv。 N°%s，电话：%s
+TotalSituationInvoice=总情况
+invoiceLineProgressError=发票行进度不能大于或等于下一个发票行
+updatePriceNextInvoiceErrorUpdateline=错误：发票行更新价格：%s
+ToCreateARecurringInvoice=要为此合同创建定期发票，请先创建此草稿发票，然后将其转换为发票模板，并定义生成未来发票的频率。
+ToCreateARecurringInvoiceGene=要定期和手动生成未来发票，只需进入菜单<strong> %s  -  %s  -  %s </strong>。
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=删除模板发票
+ConfirmDeleteRepeatableInvoice=您确定要删除模板发票吗？
+CreateOneBillByThird=每个合作方创建一个发票（否则，每个订单一个发票）
+BillCreated=%s条例草案已创建
+StatusOfGeneratedDocuments=文件生成的状态
+DoNotGenerateDoc=不生成文档文件
+AutogenerateDoc=自动生成文档文件
+AutoFillDateFrom=使用发票日期设置服务项目的开始日期
+AutoFillDateFromShort=设置开始日期
+AutoFillDateTo=使用下一个发票日期设置服务项目的结束日期
+AutoFillDateToShort=设置结束日期
+MaxNumberOfGenerationReached=最大数量。到达
+BILL_DELETEInDolibarr=发票已删除
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 9eb442c8c0c..398501cef4d 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -14,7 +14,7 @@ ShoppingCart=零售单
 NewSell=新零售单
 AddThisArticle=添加项目
 RestartSelling=回去就卖
-SellFinished=Sale complete
+SellFinished=销售完成
 PrintTicket=打印零售记录
 NoProductFound=空空如也——没有找到项目
 ProductFound=找到产品
@@ -25,10 +25,20 @@ Difference=差异
 TotalTicket=总计
 NoVAT=没有为本零售单计算增值税
 Change=找零
-BankToPay=Account for payment
+BankToPay=付款帐户
 ShowCompany=显示公司
 ShowStock=显示仓库
 DeleteArticle=删除项目
 FilterRefOrLabelOrBC=搜索 (REF /标签)
-UserNeedPermissionToEditStockToUsePos=你已经要求在POS销售时进行库存更新，所以操作POS模块的用户必须有更改库存的权限。
+UserNeedPermissionToEditStockToUsePos=您要求减少发票创建的库存，因此使用POS的用户需要具有编辑库存的权限。
 DolibarrReceiptPrinter=Dolibarr 发票打印机
+PointOfSale=POS
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=地板
+Floor=地板
+AddTable=添加表格
+Place=地点
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=订购打印机
+SearchProduct=搜索产品
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 3c6915c5314..1f3db8e0946 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -10,7 +10,7 @@ NewAction=新建事件
 AddAction=新建事件
 AddAnAction=新建事件
 AddActionRendezVous=新建会议
-ConfirmDeleteAction=Are you sure you want to delete this event?
+ConfirmDeleteAction=你确定要删除这个事件？
 CardAction=事件卡
 ActionOnCompany=关联公司
 ActionOnContact=关联联系人
@@ -18,8 +18,8 @@ TaskRDVWith=与 %s 会议
 ShowTask=显示任务
 ShowAction=显示事件
 ActionsReport=事件报告
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+ThirdPartiesOfSaleRepresentative=第三方与销售代表
+SaleRepresentativesOfThirdParty=合作方销售代表
 SalesRepresentative=销售代表
 SalesRepresentatives=销售代表
 SalesRepresentativeFollowUp=销售代表 (跟进)
@@ -29,12 +29,12 @@ ShowCustomer=显示客户
 ShowProspect=显示准客户
 ListOfProspects=准客户列表
 ListOfCustomers=客户列表
-LastDoneTasks=Latest %s completed actions
+LastDoneTasks=最新的%s完成了行动
 LastActionsToDo=最早的 %s 未完成动作
 DoneAndToDoActions=已完成和未完成任务
 DoneActions=已完成的动作
 ToDoActions=不完整的事件
-SendPropalRef=提交商业报价 %s 
+SendPropalRef=提交商业报价 %s
 SendOrderRef=订单 %s 的提交
 StatusNotApplicable=不适用
 StatusActionToDo=需要完成
@@ -52,6 +52,7 @@ ActionAC_TEL=电话
 ActionAC_FAX=发送传真
 ActionAC_PROP=通过邮件发送报价
 ActionAC_EMAIL=发送电子邮件
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=会议
 ActionAC_INT=干预
 ActionAC_FAC=通过邮件发送客户发票
@@ -60,20 +61,20 @@ ActionAC_CLO=关闭
 ActionAC_EMAILING=发送群发电子邮件
 ActionAC_COM=通过邮件发送客户订单
 ActionAC_SHIP=发送发货单
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=通过邮件发送采购订单
+ActionAC_SUP_INV=通过邮件发送供应商发票
 ActionAC_OTH=其他
 ActionAC_OTH_AUTO=自动插入事件
 ActionAC_MANUAL=手动插入事件
 ActionAC_AUTO=自动插入事件
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=自动
 Stats=销售统计
 StatusProsp=准客户状态
 DraftPropals=起草商业报价
 NoLimit=没有限制
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=链接在线签名
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=此屏幕允许您接受，签署或拒绝报价/商业提案
+ThisIsInformationOnDocumentToSign=这是关于接受或拒绝的文件的信息
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=禁用联机签名的功能或在启用功能之前生成的文档
diff --git a/htdocs/langs/zh_CN/dict.lang b/htdocs/langs/zh_CN/dict.lang
index bab583c41ff..dd2fa2c81e1 100644
--- a/htdocs/langs/zh_CN/dict.lang
+++ b/htdocs/langs/zh_CN/dict.lang
@@ -116,7 +116,7 @@ CountryHM=赫德岛和麦当劳
 CountryVA=罗马教廷（梵蒂冈城国）
 CountryHN=洪都拉斯
 CountryHK=香港
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=印度
 CountryID=印度尼西亚
 CountryIR=伊朗
@@ -131,7 +131,7 @@ CountryKI=基里巴斯
 CountryKP=北朝鲜
 CountryKR=韩国
 CountryKW=科威特
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=老挝
 CountryLV=拉脱维亚
 CountryLB=黎巴嫩
@@ -160,7 +160,7 @@ CountryMD=摩尔多瓦
 CountryMN=蒙古
 CountryMS=蒙特塞拉特
 CountryMZ=莫桑比克
-CountryMM=Birmania（缅甸）
+CountryMM=Myanmar (Burma)
 CountryNA=纳米比亚
 CountryNR=瑙鲁
 CountryNP=尼泊尔
@@ -223,7 +223,7 @@ CountryTO=汤加
 CountryTT=特里尼达和多巴哥
 CountryTR=土耳其
 CountryTM=土库曼斯坦
-CountryTC=特克斯群岛和Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=图瓦卢
 CountryUG=乌干达
 CountryUA=乌克兰
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=毛里求斯卢比
 CurrencySingMUR=毛里求斯卢比
 CurrencyNOK=挪威克朗
-CurrencySingNOK=挪威克朗
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=突尼斯第纳尔
 CurrencySingTND=突尼斯第纳尔
 CurrencyUSD=美元
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=口碑
 DemandReasonTypeSRC_PARTNER=伙伴
 DemandReasonTypeSRC_EMPLOYEE=雇员
 DemandReasonTypeSRC_SPONSORING=赞助
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=4A0格式
 PaperFormatEU2A0=2A0格式
@@ -328,8 +329,8 @@ PaperFormatCAP5=加拿大 P5格式
 PaperFormatCAP6=加拿大 P6格式
 #### Expense report categories ####
 ExpAutoCat=汽车
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpCycloCat=助力车
+ExpMotoCat=摩托车
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -351,7 +352,7 @@ ExpAuto10PCV=10 CV and more
 ExpAuto11PCV=11 CV and more
 ExpAuto12PCV=12 CV and more
 ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpCyclo=容量低至50cm3
+ExpMoto12CV=摩托车1或2 CV
+ExpMoto345CV=摩托车3,4或5 CV
+ExpMoto5PCV=摩托车5 CV等等
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index df401ec6161..6789b37456d 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=铌在目录中的文档
+ECMNbOfDocs=No. of documents in directory
 ECMSection=目录
 ECMSectionManual=手册目录
 ECMSectionAuto=自动目录
@@ -14,17 +14,17 @@ ECMNbOfFilesInDir=在目录中的文件数
 ECMNbOfSubDir=数子目录
 ECMNbOfFilesInSubDir=子目录中的文件数量
 ECMCreationUser=创造者
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=电子文档管理
+ECMAreaDesc=DMS / ECM（文档管理系统/电子内容管理）区域允许您快速保存，共享和搜索Dolibarr中的所有类型的文档。
 ECMAreaDesc2=*自动填写目录时自动加入一个元素从卡的文件。 <br> *手动目录可以用来保存未链接到一个特定元素的文件。
 ECMSectionWasRemoved=目录<b>%s</b>已被删除。
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=目录<b> %s</b>已创建。
 ECMSearchByKeywords=搜寻关键字
 ECMSearchByEntity=搜索对象
 ECMSectionOfDocuments=目录中的文件
 ECMTypeAuto=自动
 ECMDocsBySocialContributions=社会或财政税相关文档
-ECMDocsByThirdParties=合伙人相关文档
+ECMDocsByThirdParties=合作方相关文档
 ECMDocsByProposals=报价相关文档
 ECMDocsByOrders=客户订单相关文档
 ECMDocsByContracts=文件与合约
@@ -33,19 +33,20 @@ ECMDocsByProducts=产品相关文档
 ECMDocsByProjects=项目相关文件
 ECMDocsByUsers=用户相关文档
 ECMDocsByInterventions=干预相关文档
-ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByExpenseReports=与费用报告相关的文件
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=没有目录中创建
 ShowECMSection=显示目录
 DeleteSection=删除目录
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ConfirmDeleteSection=您能否确认要删除目录<b> %s </b>？
 ECMDirectoryForFiles=相对目录的文件
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=不可删除，因为它包含一些文件或子目录
+CannotRemoveDirectoryContainsFiles=不可删除，因为它包含一些文件
 ECMFileManager=档案管理员
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
-NoDirectoriesFound=No directories found
+ECMSelectASection=请在左侧目录树中选取目录...
+DirNotSynchronizedSyncFirst=此目录似乎是在ECM模块外部创建或修改的。您必须先单击“重新同步”按钮以同步磁盘和数据库以获取此目录的内容。
+ReSyncListOfDir=重新同步目录列表
+HashOfFileContent=散列文件内容
+NoDirectoriesFound=找不到目录
+FileNotYetIndexedInDatabase=文件尚未编入数据库（尝试重新上传）
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index fac2aa4abaa..f17650d5136 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP 客户端失败错误为 '%s'
 ErrorGlobalVariableUpdater5=没有全局变量选择
 ErrorFieldMustBeANumeric=填写 <b>%s</b> 必须为数字值
 ErrorMandatoryParametersNotProvided=未提供强制参数
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=无法加载%s的模块描述符类
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=模块描述符中菜单数组的错误定义（关键字fk_menu的错误值）
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=产品条形码%s已存在于其他产品参考
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=还要注意，当至少一个子产品（或子产品的子产品）需要序列号/批号时，使用虚拟产品来自动增加/减少子产品是不可能的。
 ErrorDescRequiredForFreeProductLines=对于包含免费产品的行，必须说明
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=为此成员设置了密码。但是，未创建任何用户帐户。因此，此密码已存储，但无法用于登录Dolibarr。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
 WarningMandatorySetupNotComplete=初始参数尚未设置
diff --git a/htdocs/langs/zh_CN/help.lang b/htdocs/langs/zh_CN/help.lang
index cf35dd3de5d..d12483eefae 100644
--- a/htdocs/langs/zh_CN/help.lang
+++ b/htdocs/langs/zh_CN/help.lang
@@ -5,22 +5,19 @@ RemoteControlSupport=网上实时/远程支持
 OtherSupport=其他支持
 ToSeeListOfAvailableRessources=查看/联络可用的资源：
 HelpCenter=帮助中心
-DolibarrHelpCenter=Dolibarr帮助和支持中心
-ToGoBackToDolibarr=或者，请点击<a href="%s">返回</a>简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
-TypeOfSupport=源支持
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=社区（免费）
 TypeSupportCommercial=商业
 TypeOfHelp=类型
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=需要帮助或支持？
 Efficiency=效率
 TypeHelpOnly=只有帮助
 TypeHelpDev=帮助+开发
-TypeHelpDevForm=帮助+开发+形成
-ToGetHelpGoOnSparkAngels1=有些公司可以提供快速（有时直接的），并采取更有效的在线控制您的计算机支持。这些佣工可以是<b>%s</b>网站上找到：
-ToGetHelpGoOnSparkAngels3=您还可以到所有可用的Dolibarr教练列表，点击这个按钮
-ToGetHelpGoOnSparkAngels2=有时，是目前公司没有可供您进行搜索，所以想改变过滤器，以寻找“所有的可用性”。您将能够发送更多的请求。
-BackToHelpCenter=或者，请点击<a href="%s">返回帮助中心</a> 。简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
-LinkToGoldMember=你可以调用由Dolibarr预选您的语言（%s的按一下他的小工具（状态和最高价格自动更新））的教练之一：
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=支持的语言
-SubscribeToFoundation=帮助Dolibarr项目，认购的机构
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=使用您的语言的 Dolibarr 官方支持: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 571fad17dbe..4c21e49d14e 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=人事管理
-Holidays=请假
-CPTitreMenu=请假
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=月结单
 MenuAddCP=新建请假请求
-NotActiveModCP=你必须先启用请假模块再查看本页。
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=做一个请假申请
 DateDebCP=开始日期
 DateFinCP=结束日期
@@ -15,13 +15,18 @@ ApprovedCP=批准
 CancelCP=取消
 RefuseCP=拒绝
 ValidatorCP=同意
-ListeCP=请假记录
-ReviewedByCP=Will be approved by
+ListeCP=List of leave
+LeaveId=请假申请 ID
+ReviewedByCP=审批人：
+UserForApprovalID=用户的批准ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=登录审批用户
 DescCP=描述
 SendRequestCP=创建请假请求
 DelayToRequestCP=超过 <b>%s 天(s)</b> 必须请假.
-MenuConfCP=请假平衡
-SoldeCPUser=请假平衡 <b>%s</b> 天。
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=你选取的结束日期必须大于起始日期要不然时光逆转就说不过去啦。
 ErrorSQLCreateCP=创建过程中发生了一个SQL错误：
 ErrorIDFicheCP=出现一个错误，请假申请不存在。
@@ -30,7 +35,14 @@ ErrorUserViewCP=您无权阅读该请假申请。
 InfosWorkflowCP=工作流程信息
 RequestByCP=申请人
 TitreRequestCP=请假条
+TypeOfLeaveId=请假ID的类型
+TypeOfLeaveCode=请假类型
+TypeOfLeaveLabel=请假标签的类型
 NbUseDaysCP=消耗的休假天数
+NbUseDaysCPShort=消耗的天数
+NbUseDaysCPShortInMonth=一个月消耗的天数
+DateStartInMonth=以月开始日期
+DateEndInMonth=截止日期
 EditCP=编辑
 DeleteCP=删除
 ActionRefuseCP=拒绝
@@ -59,6 +71,7 @@ DateRefusCP=拒绝日期
 DateCancelCP=注销日期
 DefineEventUserCP=为用户分配一个特殊的假期
 addEventToUserCP=指定休假
+NotTheAssignedApprover=您不是指定的审批人
 MotifCP=雷森
 UserCP=用户
 ErrorAddEventToUserCP=添加外部请假时出错异常。
@@ -76,15 +89,20 @@ BoxTitleLastLeaveRequests=最近变更的 %s 份请假申请
 HolidaysMonthlyUpdate=每月更新
 ManualUpdate=手动更新
 HolidaysCancelation=请假申请取消
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-
+EmployeeLastname=员工姓氏
+EmployeeFirstname=员工名字
+TypeWasDisabledOrRemoved=请假类型（id %s）已被禁用或删除
+LastHolidays=最新的%s请假
+AllHolidays=所有请假
+HalfDay=半天
+NotTheAssignedApprover=您不是指定的审批人
+LEAVE_PAID=带薪休假
+LEAVE_SICK=病假
+LEAVE_OTHER=其他请假
+LEAVE_PAID_FR=带薪休假
 ## Configuration du Module ##
-LastUpdateCP=最后自动更新请假分配
-MonthOfLastMonthlyUpdate=本月最后自动更新请假分配
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=更新成功。
 Module27130Name= 管理请假申请
 Module27130Desc= 管理请假申请
@@ -94,13 +112,18 @@ NoticePeriod=通知期限
 HolidaysToValidate=批准请假申请
 HolidaysToValidateBody=下面是请假申请批准
 HolidaysToValidateDelay=这个请假申请的时间要求小于 %s 天.
-HolidaysToValidateAlertSolde=用户请假申请的天数超出准假时间天数范围。
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=批准请假申请
 HolidaysValidatedBody=你的请假申请 %s 到 %s 已批准。
 HolidaysRefused=申请否认
 HolidaysRefusedBody=你的请假申请 %s 到 %s 被否认的原因如下 :
 HolidaysCanceled=已取消请假申请
 HolidaysCanceledBody=你的请假申请 %s 到 %s 已取消。
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=点击 <strong>主页 - 设置 - 词汇表 - 请假类型表</strong> 设置请假类型不同的事由。
+FollowedByACounter=1：这种假期需要一个计数器。计数器手动或自动递增，当验证请假时，计数器递减。<br> 0：无计数器。
+NoLeaveWithCounterDefined=没有定义的休假类型需要由计数器跟随
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 2e2ee9abe0d..b84c97eaecc 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=按照安装指南手册一步步执行即可。
 MiscellaneousChecks=服务器环境检查
 ConfFileExists=配置文件 <b>%s</b> 已存在。
-ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在并且无法创建请给予写入权限！
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=已创建好 <b>%s</b> 配置文件。
-ConfFileIsNotWritable=配置文件 <b>%s</b> 没有写权限。烦请再次检查权限设置。首次安装时，Web服务器必须设置该配置文件为可写权限 (例如Unix系统中需要用"chmod 666"命令来赋予权限)。
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=配置文件 <b>%s</b> 为可写权限。
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=从新的配置文件中加载全部信息。
+ConfFileMustBeAFileNotADir=配置文件<b> %s </b>必须是文件，而不是目录。
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=PHP多线程支持。
 PHPSupportPOSTGETOk=PHP的POST和GET支持。
-PHPSupportPOSTGETKo=有可能你的PHP安装程序不支持变量POST或GET。检查php.ini中参数 <b>variables_order</b> 的设置。
-PHPSupportGD=PHP开启GD图形功能。
-PHPSupportCurl=PHP的 Curl支持。
-PHPSupportUTF8=PHP开启UTF8功能。
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=您的PHP最大session会话内存设置为<b>%s</b>。这应该够了的。
-PHPMemoryTooLow=您的PHP最大session会话内存设置为 <b>%s</b>bytes字节。这太低了点儿。请修改 <b>php.ini</b> 中 <b>memory_limit</b>的参数的设置值改大点儿至少  <b>%s</b> bytes字节。
-Recheck=点击这里有更多的有意义的测试
-ErrorPHPDoesNotSupportSessions=您的PHP安装不支持 sessions会话。而Dolibarr要求 sessions会话功能必须启用并激活Dolibarr才能正常运行。烦请再次检查PHP配置参数是否启用 sessions会话功能。
-ErrorPHPDoesNotSupportGD=您的PHP安装不支持GD图形功能。作图功能将失效。
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=你的PHP服务器不支持Curl。
-ErrorPHPDoesNotSupportUTF8=您的PHP安装不支持UTF8的功能。 Dolibarr不能正常工作。安装Dolibarr之前请先解决UTF8支持问题。
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=目录 %s 不存在。
-ErrorGoBackAndCorrectParameters=请返回上页并修正里面错误的参数然后再继续下一步。
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=您可能输入了一个错误的参数值的 '%s' 。
 ErrorFailedToCreateDatabase=无法创建数据库 '%s'。
 ErrorFailedToConnectToDatabase=无法连接到数据库 '%s'。
 ErrorDatabaseVersionTooLow=数据库版本 (%s) 太低了，需要 %s 或更高版本。
 ErrorPHPVersionTooLow=PHP的版本太旧了。至少需要 %s 版本。
-ErrorConnectedButDatabaseNotFound=成功连接到数据库服务器的，但不存在 '%s' 数据库，没找着啊，亲。
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=数据库 '%s' 已存在。
-IfDatabaseNotExistsGoBackAndUncheckCreate=如果数据库不存在，请返回检查并选择“创建数据库”。
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=如果数据库已经存在，请返回并取消选中“创建数据库”选项。
-WarningBrowserTooOld=浏览器的版本太旧，您的浏览器得升级到最新的版本才行，我们建议您使用Firefox，Chrome或Opera等更棒的浏览器。
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP版本
 License=使用许可
 ConfigurationFile=配置文件
@@ -45,22 +45,23 @@ DolibarrDatabase=配置Dolibarr数据库
 DatabaseType=数据库类型
 DriverType=驱动类型
 Server=服务器
-ServerAddressDescription=这里填写数据库服务器域名或IP地址，当数据库服务器的地址存放在Web服务器相同的服务器的时候，通常填的是'localhost'本机
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=这里填写数据库服务器端口。如果不懂的话请略过不动它原来是什么就是什么就好啦。
 DatabaseServer=数据库服务器
 DatabaseName=数据库名称
-DatabasePrefix=数据库表前缀
-AdminLogin=这里填写Dolibarr数据库的账号。
-PasswordAgain=确认密码
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=这里填写Dolibarr数据库的密码。
 CreateDatabase=创建数据库
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=数据库服务器 - 超级用户
-CheckToCreateDatabase=勾选此选项则表示如果数据库不存在则创建数据库。<br>在这种情况下, 勾选之后会在页底显示填写超级数据库账号和密码的输入框。
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=选中此项表示使用有创建数据库并且可创建数据库登陆账号的权限，前提是假如填写的数据库不存在。
-KeepEmptyIfNoPassword=如果账号无需密码则保留空白不填写(最好避免空密码这种情况不安全呀)
-SaveConfigurationFile=保存参数
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=服务器连接
 DatabaseCreation=创建数据库
 CreateDatabaseObjects=创建数据库对象
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=创建表的外键和索引 %s
 OtherKeysCreation=创建外键和索引
 FunctionsCreation=创建主要功能模块
 AdminAccountCreation=创建管理员登陆账号
-PleaseTypePassword=请输入密码，密码不得为空！
-PleaseTypeALogin=请输入登陆账号！
-PasswordsMismatch=密码不正确，请重试！
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=安装成功
 SystemIsInstalled=安装结束。
 SystemIsUpgraded=Dolibarr升级成功。
@@ -81,73 +82,73 @@ YouNeedToPersonalizeSetup=请您进入后台管理并设定相关功能模块的
 AdminLoginCreatedSuccessfuly=Dolibarr后台管理账号 '<b>%s</b>' 创建完毕。
 GoToDolibarr=前往Dolibarr
 GoToSetupArea=欢迎进入 Dolibarr 美妙世界 (后台管理)
-MigrationNotFinished=您的数据库的版本是不完全最新的，所以你必须再次运行升级过程。
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=转到页再次升级
-WithNoSlashAtTheEnd=注意：末尾没有斜杠 "/" 
-DirectoryRecommendation=基于安全及习惯做法我们推荐你使用网页目录以外的目录当然使用默认的也是可以的不强求。
+WithNoSlashAtTheEnd=注意：末尾没有斜杠 "/"
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=已存在
 DolibarrAdminLogin=Dolibarr后台管理账号名
-AdminLoginAlreadyExists=Dolibarr管理员帐户<b>'%s'</b>已经存在。
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=温馨提示，出于安全考量，安装或升级完成后你应删除<b>安装目录<b>或重命名为 <b>install.lock</b> ，以避免被他人恶意利用重装Dolibarr。
-FunctionNotAvailableInThisPHP=此服务器上的PHP不支持
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=无法创建Dolibarr管理员帐户。
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=选择迁移脚本
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+DataMigration=数据库迁移（数据）
+DatabaseMigration=数据库迁移（结构+一些数据）
 ProcessMigrateScript=脚本处理
 ChooseYourSetupMode=选择你的安装模式，然后点击“开始”...
 FreshInstall=全新安装
-FreshInstallDesc=如果这是你第一次安装，请使用此模式然后点击"开始"。如果不是，这个模式可以修复前次的不完全的安装。但是如果你想升级你的版本，请选择底下的“升级”模式如果它可用的话显示不可用就没得选啦。
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=升级
 UpgradeDesc=如果你使用这种模式已经取代了从一个较新版本的文件旧Dolibarr文件。这将提升您的数据库和数据。
 Start=开始
 InstallNotAllowed=安装程序不容许<b>conf.php</b>权限
 YouMustCreateWithPermission=您必须创建文件%s，并且给予Dolibarr安装程序的读取和写入该文件的权限。
-CorrectProblemAndReloadPage=请修正未打勾项之后，该给读写权限就给chmod 777该怎样就修正之后，按F5刷新页面再安装或升级Dolibarr。
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=已迁移
 DatabaseVersion=数据库版本
 ServerVersion=数据库服务器版本
 YouMustCreateItAndAllowServerToWrite=您必须创建此目录和Web服务器允许写进去。
 DBSortingCollation=字符排序
-YouAskDatabaseCreationSoDolibarrNeedToConnect=你问到创建数据库<b>%s，</b>但对于这一点，Dolibarr需要连接到伺服器<b>%S</b>与超级用户<b>%s</b>的权限。
-YouAskLoginCreationSoDolibarrNeedToConnect=你问到创建数据库登陆 <b>%s</b>, 但是对于这一点，Dolibarr需要连接到伺服器<b>%s</b> 与超级用户 <b>%s</b> 的权限。
-BecauseConnectionFailedParametersMayBeWrong=作为连接失败，主机或超级用户参数一定是错误的。
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=孤儿付款检测方法%s
 RemoveItManuallyAndPressF5ToContinue=手动删除它，然后按F5键继续。
 FieldRenamed=重命名栏位
-IfLoginDoesNotExistsCheckCreateUser=如果登陆名不存在，则你必须检查选项“创建用户”
-ErrorConnection=服务器 "<b>%s</b>", 数据库名称 "<b>%s</b>", 并登陆 "<b>%s</b>", 或数据库密码可能是错误或PHP的客户端版本可能太旧版本相比，数据库。
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=推荐选择<b>你</b>的安装版本<b>%%s</b>从当前版本
 InstallChoiceSuggested=<b>通过安装向导安装所选</b> 。
-MigrateIsDoneStepByStep=目标版本（%s）有好几个版本的差距，因此，安装向导会回来一次将完成这一个建议未来的迁移。
-CheckThatDatabasenameIsCorrect=检查数据库名称<b>“%s”</b>是正确的。
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=如果此名称是正确的，该数据库尚不存在，你必须检查选项“创建数据库”。
 OpenBaseDir=PHP的openbasedir参数
-YouAskToCreateDatabaseSoRootRequired=你选中的选框“创建数据库”。为此，您需要提供登陆/密码的超级用户(表单底部)。
-YouAskToCreateDatabaseUserSoRootRequired=你选中的选框“创建数据库所有者”。为此，您需要提供登陆/密码的超级用户(表单底部)。
-NextStepMightLastALongTime=当前操作可能会持续几分钟。请耐心等待网页自动跳转至下一页面，谢谢合作！
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=客户订单送货迁移存储
 MigrationShippingDelivery=送货升级存储
 MigrationShippingDelivery2=送货升级存储 2
 MigrationFinished=迁移完成
-LastStepDesc=<strong>最后设置管理员登陆账号及密码</strong> ：此处定义的是后台管理的登陆账号和密码。所创建的账号密码可别弄丢了哟！
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=激活启用模块%s
 ShowEditTechnicalParameters=点击此处显示/编辑高级参数（专家模式）
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=您的数据库版本为%s。此版本有关键性错误：如果进行数据结构调整（数据迁移过程必须调整数据结构），您会丢失数据。因此，直到您升级数据库到更高级无错误版本前，不允许迁移操作(已知有问题的版本列表：%s)
-KeepDefaultValuesWamp=您使用从DoliWamp Dolibarr安装向导，所以这里建议值已经进行了优化。他们唯一的变化，如果你知道你做什么。
-KeepDefaultValuesDeb=您使用从Ubuntu或者Debian软件包的Dolibarr安装向导，所以这里建议值已经进行了优化。只有数据库的所有者创建的密码必须完成。其他参数的变化，如果你只知道你做什么。
-KeepDefaultValuesMamp=您使用从DoliMamp Dolibarr安装向导，所以这里建议值已经进行了优化。他们唯一的变化，如果你知道你做什么。
-KeepDefaultValuesProxmox=您使用Proxmox的虚拟设备的Dolibarr安装向导，因此，这里提出的价值已经优化。改变他们，只有当你知道你做什么。
-UpgradeExternalModule=Run dedicated upgrade process of external modules
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=将至少一个选项设置为URL中的参数。例如：'... repair.php？standard = confirmed'
+NothingToDelete=无需清理/删除
+NothingToDo=空闲
 #########
 # upgrade
 MigrationFixData=修正了非规范化数据
 MigrationOrder=数据迁移的客户订单
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=供应商订单的数据迁移
 MigrationProposal=数据迁移的商业报价
 MigrationInvoice=数据迁移的客户发票
 MigrationContract=数据迁移合同
@@ -163,9 +164,9 @@ MigrationContractsUpdate=合同数据校正
 MigrationContractsNumberToUpdate=%的合同（县）更新
 MigrationContractsLineCreation=创建合同号线中1%的合同
 MigrationContractsNothingToUpdate=没有更多的事情要做
-MigrationContractsFieldDontExist=栏位 fk_facture 不存在。啥也没干。
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=合同空日期更正
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=没有合同的日期，以正确的空
 MigrationContractsEmptyCreationDatesNothingToUpdate=没有合同，以正确的创建日期
 MigrationContractsInvalidDatesUpdate=合同日期更正错误的价值
@@ -173,13 +174,13 @@ MigrationContractsInvalidDateFix=正确的%s的合同（合同日期=%s后，开
 MigrationContractsInvalidDatesNumber=%s 联系人已变更
 MigrationContractsInvalidDatesNothingToUpdate=无不良日至正确的价值
 MigrationContractsIncoherentCreationDateUpdate=合同无效值创建日期更正
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateUpdateSuccess=差值合约创建日期更正成功完成
 MigrationContractsIncoherentCreationDateNothingToUpdate=对合同成立之日起，纠正不良的价值
 MigrationReopeningContracts=未平仓合约关闭错误
 MigrationReopenThisContract=重新打开%s的合同
 MigrationReopenedContractsNumber=%s 联系人变更
 MigrationReopeningContractsNothingToUpdate=没有合同，打开封闭
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=更新银行条目和银行转帐之间的链接
 MigrationBankTransfertsNothingToUpdate=所有链接是最新的
 MigrationShipmentOrderMatching=发送收据更新
 MigrationDeliveryOrderMatching=送达回执更新
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=送货更新
 MigrationStockDetail=更新产品的库存值
 MigrationMenusDetail=最新动态菜单表
 MigrationDeliveryAddress=更新货物的配送地址
-MigrationProjectTaskActors=数据llx_projet_task_actors迁移表
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=数据迁移llx_projet领域fk_user_resp到llx_element_contact
 MigrationProjectTaskTime=更新时间花费在几秒钟内
 MigrationActioncommElement=更新动作数据
 MigrationPaymentMode=付款方式的数据迁移
 MigrationCategorieAssociation=迁移类别
-MigrationEvents=迁移事件数据：将事件所有者数据添加到任务列表
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=更新 llx_societe_remise 的实际栏位参数值
 MigrationRemiseExceptEntity=更新 llx_societe_remise_except 的实际栏位参数值
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserRightsEntity=更新llx_user_rights的实体字段值
+MigrationUserGroupRightsEntity=更新llx_usergroup_rights的实体字段值
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=重载模块%s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=显示不可用的选项
-HideNotAvailableOptions=隐藏不可用的选项
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+MigrationResetBlockedLog=重置模块BlockedLog for v7算法
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=点击此处转到您的申请
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ba1e8061c04..c45ee7d448c 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=合伙人联系方式
 ContactsAddressesForCompany=这个合伙人联系人/地址
 AddressesForCompany=这个合伙人的地址
 ActionsOnCompany=有关此合伙人的事件
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=有关此会员的事件
 ActionsOnProduct=有关此产品的事件
 NActionsLate=逾期 %s
@@ -847,9 +848,9 @@ ModuleBuilder=模块工厂
 SetMultiCurrencyCode=设置货币
 BulkActions=批量行动
 ClickToShowHelp=单击以显示工具提示帮助
-WebSite=网站
+WebSite=Website
 WebSites=网站
-WebSiteAccounts=网站帐户
+WebSiteAccounts=Website accounts
 ExpenseReport=费用报表
 ExpenseReports=费用报表
 HR=HR
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=文件通过链接共享
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=库存
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 902a45c8510..c5cebc71bdc 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -83,6 +83,7 @@ LinkedObject=链接对象
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__（你好）__\n这是发送到__EMAIL__的测试邮件。\n这两条线由回车分隔。\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__（你好）__\n这是<b>测试</ b>邮件（单词test必须以粗体显示）。<br>这两行用回车符分隔。<br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__（你好）__\n\n\n__（此致）__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=建立模块化的网页
 WEBSITE_PAGEURL=页面URL地址
 WEBSITE_TITLE=标题
 WEBSITE_DESCRIPTION=描述
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=关键字
 LinesToImport=要导入的行
diff --git a/htdocs/langs/zh_CN/paybox.lang b/htdocs/langs/zh_CN/paybox.lang
index 4b0d021dfdb..212d9da6863 100644
--- a/htdocs/langs/zh_CN/paybox.lang
+++ b/htdocs/langs/zh_CN/paybox.lang
@@ -3,14 +3,14 @@ PayBoxSetup=PayBox模块设置
 PayBoxDesc=该模块提供的网页，以便在付款<a href="http://www.paybox.com" target="_blank">Paybox</a>客户。这可以用来为一个自由付款或就某一Dolibarr对象（发票，订货，付款...）
 FollowingUrlAreAvailableToMakePayments=以下网址可提供给客户的网页上，能够作出Dolibarr支付对象
 PaymentForm=付款方式
-WelcomeOnPaymentPage=欢迎您来到我们的在线支付服务
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=这个屏幕允许你进行网上支付%s。
 ThisIsInformationOnPayment=这是在做付款信息
 ToComplete=要完成
 YourEMail=付款确认的电子邮件
 Creditor=债权人
 PaymentCode=付款代码
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=使用信用卡或借记卡付款（Paybox）
 ToPay=执行付款
 YouWillBeRedirectedOnPayBox=您将被重定向担保Paybox页，输入您的信用卡信息
 Continue=下一个
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=网址提供发票一%s在线支付的用
 ToOfferALinkForOnlinePaymentOnContractLine=网址提供了一个合同线%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=网址提供一个免费的网上支付金额%s用户界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=网址为会员提供订阅%s在线支付的用户界面
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=设置您的<b>%s</b> PayBox与网址有paybox付款时自动创建的验证。
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=本页面确认您的付款已记录。谢谢。
-YourPaymentHasNotBeenRecorded=您的付款并没有被记录和交易已取消。谢谢。
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=帐户参数
 UsageParameter=使用参数
 InformationToFindParameters=帮助，找到你的%s帐户信息
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index a662e5d7711..ff4878f066f 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -13,8 +13,8 @@ Prospect=准客户
 DeleteProp=删除报价单
 ValidateProp=确定报价单
 AddProp=创建建议
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+ConfirmDeleteProp=您确定要删除此商业提案吗？
+ConfirmValidateProp=您确定要以名称<b> %s </b>验证此商业提案吗？
 LastPropals=最近的 %s 份报价
 LastModifiedProposals=最近变更的 %s 份报价
 AllPropals=全部报价单
@@ -28,12 +28,12 @@ ShowPropal=显示报价
 PropalsDraft=草稿
 PropalsOpened=打开
 PropalStatusDraft=草稿(需要验证)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=已验证（提案已打开）
 PropalStatusSigned=已签署(待付款)
 PropalStatusNotSigned=未签署(已关闭)
 PropalStatusBilled=已到账
 PropalStatusDraftShort=草稿
-PropalStatusValidatedShort=已确认
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=已禁用
 PropalStatusSignedShort=已签署
 PropalStatusNotSignedShort=未签署
@@ -53,12 +53,12 @@ ErrorPropalNotFound=未发现报价单 %s
 AddToDraftProposals=添加至报价草稿
 NoDraftProposals=没有报价草稿
 CopyPropalFrom=通过复制(并变更)现有报价单创建新报价单
-CreateEmptyPropal=新建空白报价单
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=默认报价单有效期(按天计算)
-UseCustomerContactAsPropalRecipientIfExist=报价单中使用客户联系人信息中的地址，不使用客户公司的办公地址是。
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=复制报价单
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ConfirmClonePropal=您确定要克隆商业提案<b> %s </b>吗？
+ConfirmReOpenProp=您确定要打开商业提案<b> %s </b>吗？
 ProposalsAndProposalsLines=报价单和报价项目
 ProposalLine=报价项目
 AvailabilityPeriod=交货延迟期
@@ -75,9 +75,10 @@ AvailabilityTypeAV_1M=1 个月
 TypeContact_propal_internal_SALESREPFOLL=跟进报价的销售代表
 TypeContact_propal_external_BILLING=客户账单联系人
 TypeContact_propal_external_CUSTOMER=跟进报价的客户联系人
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=客户联系以便交付
 # Document models
 DocModelAzurDescription=完整的订单模版 (LOGO标志...)
+DocModelCyanDescription=完整的订单模版 (LOGO标志...)
 DefaultModelPropalCreate=设置默认模板
 DefaultModelPropalToBill=关闭订单时使用的默认模板(待生成账单)
 DefaultModelPropalClosed=关闭订单时使用的默认模板(待付款)
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 6fb270ee4f0..a8039393ecc 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -1,84 +1,95 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=代码
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=删除网址
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+WEBSITE_TYPE_CONTAINER=页面/容器的类型
+WEBSITE_PAGE_EXAMPLE=以网页为例
 WEBSITE_PAGENAME=页面名字/别名
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALT=替代页面名称/别名
+WEBSITE_ALIASALTDesc=在此处使用其他名称/别名列表，以便也可以使用此其他名称/别名访问该页面（例如，重命名别名后的旧名称以保持旧链接/名称工作的反向链接）。语法是：<br> alternativename1，alternativename2，...
 WEBSITE_CSS_URL=外部CSS文件的URL地址
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+WEBSITE_CSS_INLINE=CSS文件内容（所有页面共有）
+WEBSITE_JS_INLINE=Javascript文件内容（所有页面共有）
+WEBSITE_HTML_HEADER=在HTML标题的底部添加（对所有页面通用）
+WEBSITE_ROBOT=机器人文件（robots.txt）
+WEBSITE_HTACCESS=Website .htaccess file
+HtmlHeaderPage=HTML标头（仅限此页面）
+PageNameAliasHelp=页面的名称或别名。<br>当从Web服务器的虚拟主机（如Apacke，Nginx，...）运行网站时，此别名也用于伪造SEO URL。使用“<strong> %s </strong>”按钮编辑此别名。
+EditTheWebSiteForACommonHeader=注意：如果要为所有页面定义个性化标题，请在站点级别而不是页面/容器上编辑标题。
 MediaFiles=媒体库
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=编辑菜单
-EditMedias=Edit medias
-EditPageMeta=编辑 Meta
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-HomePage=Home Page
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
+EditMedias=编辑媒体
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=添加网站
+Webpage=网页/容器
+AddPage=添加页面/容器
+HomePage=主页
+PageContainer=页/容器
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=ID为%s的请求页面尚无内容，或者删除了缓存文件.tpl.php。编辑页面内容以解决此问题。
+SiteDeleted=Web site '%s' deleted
+PageContent=页/ Contenair
+PageDeleted=页面/ contenair'%s'的网站%s已删除
+PageAdded=Page / Contenair'%s'补充道
 ViewSiteInNewTab=在新标签页查看网站
 ViewPageInNewTab=在新标签页查看页面
 SetAsHomePage=设为首页
 RealURL=真实URL地址
 ViewWebsiteInProduction=使用主页URL网址查看网页
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+CheckVirtualHostPerms=还要检查虚拟主机是否有权限<strong> %s </strong>将文件转换为<br> <strong> %s </strong>
 ReadPerm=阅读
-WritePerm=Write
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Web site added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
-FetchAndCreate=Fetch and Create
-ExportSite=Export site
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
-AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=Another container
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
+WritePerm=写
+PreviewSiteServedByWebServer=<u>在新标签页中预览%s。</u> <br> <br> %s将由外部Web服务器（如Apache，Nginx，IIS）提供服务。您必须先安装并设置此服务器才能指向目录：<br> <strong> %s </strong> <br>外部服务器提供的URL：<br> <strong> %s </strong>
+PreviewSiteServedByDolibarr=<u>在新选项卡中预览%s。</u> <br> <br> %s将由Dolibarr服务器提供服务，因此不需要安装任何额外的Web服务器（如Apache，Nginx，IIS）。 <br>不方便的是，页面的URL不是用户友好的，并且以Dolibarr的路径开头。<br> Dolibarr提供的URL：<br> <strong> %s </strong> <br> <br>使用您自己的外部Web服务器为此Web站点提供服务，在Web服务器上创建指向目录的虚拟主机<br> <strong> %s </strong> <br>然后输入此虚拟服务器的名称并单击其他预览按钮。
+VirtualHostUrlNotDefined=未定义外部Web服务器所服务的虚拟主机的URL
+NoPageYet=还没有页面
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=有关特定语法提示的帮助
+YouCanEditHtmlSourceckeditor=您可以使用编辑器中的“源”按钮编辑HTML源代码。
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+ClonePage=克隆页面/容器
+CloneSite=克隆网站
+SiteAdded=Website added
+ConfirmClonePage=请输入新页面的代码/别名，如果它是克隆页面的翻译。
+PageIsANewTranslation=新页面是当前页面的翻译？
+LanguageMustNotBeSameThanClonedPage=您将页面克隆为翻译。新页面的语言必须与源页面的语言不同。
+ParentPageId=父页面ID
+WebsiteId=网站ID
+CreateByFetchingExternalPage=通过从外部URL获取页面来创建页面/容器...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=获取并创建
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=页面ID
+Banner=旗帜
+BlogPost=博客文章
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=创建网站帐户
+BackToListOfThirdParty=返回合伙人列表
+DisableSiteFirst=首先停用网站
+MyContainerTitle=我的网站标题
+AnotherContainer=另一个容器
+WEBSITE_USE_WEBSITE_ACCOUNTS=启用网站帐户表
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=启用该表以存储每个网站/合伙人的网站帐户（登录/通过）
+YouMustDefineTheHomePage=您必须先定义默认主页
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+OnlyEditionOfSourceForGrabbedContent=当从外部站点获取内容时，只能使用HTML源代码
+GrabImagesInto=抓住发现到css和页面的图像。
+ImagesShouldBeSavedInto=图像应保存到目录中
+WebsiteRootOfImages=网站图像的根目录
+SubdirOfPage=专用于页面的子目录
+AliasPageAlreadyExists=别名页面<strong> %s </strong>已存在
+CorporateHomePage=企业主页
+EmptyPage=空页面
+ExternalURLMustStartWithHttp=外部URL必须以http：//或https：//开头
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 7ce8e26c0bc..c6716500d44 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -193,7 +193,7 @@ FeatureDisabledInDemo=在展示中禁用功能
 FeatureAvailableOnlyOnStable=在官方穩定版本中可用的功能
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=僅從<a href="%s">啟用模組</a>後元件才會顯示。
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
 ModulesMarketPlaceDesc=您可在外部網頁中找到更多可下載的模組...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=找外部 app / 模組
@@ -305,7 +305,7 @@ ModuleFamilyTechnic=多種模組工具
 ModuleFamilyExperimental=實驗性模組
 ModuleFamilyFinancial=財務模組（會計/財務）
 ModuleFamilyECM=數位內容管理 (ECM)
-ModuleFamilyPortal=網站及其他應用程式
+ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=外部系統的介面
 MenuHandlers=選單處理程序
 MenuAdmin=選單編輯器
@@ -463,9 +463,9 @@ ClickToShowDescription=點選顯示描述
 DependsOn=This module needs the module(s)
 RequiredBy=模組需要此模組
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>對表單來建立新的合作方，他是 <strong>%s</strong>，<br>若只要在 url 中有一些參數時才需要預設值，則可以使用 <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValues=You must enter the relative path of the page in URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new thirdparty, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that list third-parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=啟用個人使用的預設值
 EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -487,7 +487,7 @@ DAV_ALLOW_ECM_DIRTooltip=當使用 DMS/ECM 模組時，所有採用人工方式
 Module0Name=用戶和群組
 Module0Desc=用戶/員工以及群組管理
 Module1Name=各式合作方
-Module1Desc=公司和聯絡人的管理(客戶、潛在者)
+Module1Desc=Companies and contacts management (customers, prospects...)
 Module2Name=商業
 Module2Desc=商業管理
 Module10Name=會計
@@ -501,7 +501,7 @@ Module23Desc=監測的能源消耗
 Module25Name=客戶訂單
 Module25Desc=客戶訂單管理
 Module30Name=發票
-Module30Desc=客戶發票和貸方通知單的管理。供應商發票的管理。
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=供應商
 Module40Desc=各式供應商及採購管理（採購訂單及計費）
 Module42Name=除錯日誌
@@ -902,7 +902,7 @@ DictionaryVAT=營業稅率或銷售稅率
 DictionaryRevenueStamp=稅票金額
 DictionaryPaymentConditions=付款條件
 DictionaryPaymentModes=付款方式
-DictionaryTypeContact=Contact address types
+DictionaryTypeContact=Contacts/addresses types
 DictionaryTypeOfContainer=網站頁面/容器的類型
 DictionaryEcotaxe=Ecotax（WEEE）
 DictionaryPaperFormat=文件格式
@@ -967,6 +967,7 @@ CalcLocaltax3Desc=地方稅報表是地方稅銷貨總數
 LabelUsedByDefault=若代號沒有找翻譯字句，則預設使用標籤
 LabelOnDocuments=文件上的標籤
 LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of constant
 NbOfDays=No. of days
 AtEndOfMonth=月底
 CurrentNext=現在/下一個
@@ -1053,7 +1054,7 @@ SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customiz
 SetupDescription4=<a href="%s">%s -> %s</a><br>Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
 SetupDescription5=Other Setup menu entries provides optional parameters.
 LogEvents=安全稽核事件
-Audit=稽核
+Audit=Security events
 InfoDolibarr=關於 Dolibarr
 InfoBrowser=有關於瀏覽器
 InfoOS=關於作業系統
@@ -1065,7 +1066,7 @@ BrowserName=瀏覽器名稱
 BrowserOS=瀏覽器操作系統
 ListOfSecurityEvents=Dolibarr 安全事件清單明細
 SecurityEventsPurged=清除安全事件
-LogEventDesc=您可以啟用記錄 Dolibarr 安全事件日誌。管理員就可以透過選單<b>系統工具-稽核</b> 看到內容。警告，此功能在資料庫中消耗了大量資料。
+LogEventDesc=You can enable here the logging for security events. Administrators can then see its content via menu <b>%s - %s</b>. Warning, this feature can consume a large amount of data in database.
 AreaForAdminOnly=設定參數僅由<b>管理員用戶</b>設定。
 SystemInfoDesc=僅供具有系統管理員以唯讀及可見模式取得系統資訊。
 SystemAreaForAdminOnly=此區僅供具有管理員權限用戶。Dolibarr 權限都不能減少此限制。
@@ -1096,7 +1097,7 @@ MAIN_ROUNDING_RULE_TOT=捨去範圍的步驟 (對於基數為10以外的國家/
 UnitPriceOfProduct=產品的淨單位價格
 TotalPriceAfterRounding=捨去後總價格（淨價/營業稅/含稅價）
 ParameterActiveForNextInputOnly=下一個輸入參數才能有效
-NoEventOrNoAuditSetup=尚未有被記錄的安全事件。若“設定 - 安全 - 稽核”頁面沒有啟用稽核，則為正常的。
+NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "Setup - Security - Events" page.
 NoEventFoundWithCriteria=No security event has been found for this search criteria.
 SeeLocalSendMailSetup=查看本地的 sendmail 的設定
 BackupDesc=為了完整的 Dolibarr 備份，您必須：
@@ -1141,7 +1142,7 @@ ExtraFieldsLinesRec=補充屬性 ( 範本發票行)
 ExtraFieldsSupplierOrdersLines=補充屬性(訂單行)
 ExtraFieldsSupplierInvoicesLines=補充屬性(發票行)
 ExtraFieldsThirdParties=補充屬性(合作方)
-ExtraFieldsContacts=Complementary attributes (contact address)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=補充屬性(會員)
 ExtraFieldsMemberType=補充屬性(會員類型)
 ExtraFieldsCustomerInvoices=補充屬性(發票)
@@ -1701,7 +1702,7 @@ ListOfNotificationsPerUser=每位用戶* 的通知明細表
 ListOfNotificationsPerUserOrContact=每位用戶* 或每位連絡人** 的通知明細表
 ListOfFixedNotifications=固定通知的明細表
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
+GoOntoContactCardToAddMore=移到合作方的「通知」分頁以便針對通訊錄/地址等增加或移除通知
 Threshold=Threshold
 BackupDumpWizard=構建資料庫備份轉儲檔案的精靈
 SomethingMakeInstallFromWebNotPossible=由於以下原因，無法從 Web 界面安裝外部模組：
@@ -1833,11 +1834,16 @@ EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collect for this collector now ?
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails analyzed, %s emails successfuly processed (for %s record/actions done) by collector
-RecordEvent=Record event
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfuly processed (for %s record/actions done) by collector
+RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and thirdparty if necessary)
 CodeLastResult=Result code of last collect
 NbOfEmailsInInbox=Number of email in source directory
+LoadThirdPartyFromName=Load thirdparty from name (load only)
+LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
+WithDolTrackingID=Dolibarr Tracking ID found
+WithoutDolTrackingID=Dolibarr Tracking ID not found
+FormatZip=郵遞區號
 ##### Resource ####
 ResourceSetup=du 模組資源的偏好設定
 UseSearchToSelectResource=使用尋找表單選取資源 (下拉式清單)
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 08f9263f6cb..09946509448 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -7,7 +7,7 @@ BankName=銀行名稱
 FinancialAccount=帳戶
 BankAccount=銀行帳戶
 BankAccounts=各式銀行帳戶
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank | Gateways
 ShowAccount=顯示金額
 AccountRef=金融帳戶參考值
 AccountLabel=金融帳戶標簽
@@ -46,7 +46,7 @@ BankAccountDomiciliation=帳戶地址
 BankAccountCountry=帳戶的國家
 BankAccountOwner=帳戶持有人姓名
 BankAccountOwnerAddress=帳戶持有人地址
-RIBControlError=值的完整性檢查失敗。這意味著此帳戶的資訊不完整或錯誤（檢查國家，號碼和IBAN）。
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=建立帳戶
 NewBankAccount=新帳戶
 NewFinancialAccount=新的金融帳戶
@@ -76,6 +76,7 @@ TransactionsToConciliate=調整分錄
 Conciliable=可以調節的
 Conciliate=調節
 Conciliation=調節
+SaveStatementOnly=Save statement only
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=包括已結束帳戶
 OnlyOpenedAccount=僅開放的各式帳戶
@@ -104,7 +105,7 @@ SocialContributionPayment=社會/財務稅負繳款單
 BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=從某帳戶轉到另一帳戶，Dolibarr會寫成兩筆(在來源帳戶的貸方及目的地帳戶的借方。此交易將使用相同金額、標籤及日期)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=從
 TransferTo=至
 TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
@@ -116,7 +117,7 @@ ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
 BankChecksToReceipt=託收票據
 ShowCheckReceipt=顯示支票入存收據
-NumberOfCheques=檢查數量
+NumberOfCheques=No. of check
 DeleteTransaction=刪除項目
 ConfirmDeleteTransaction=您確定要刪除此筆項目
 ThisWillAlsoDeleteBankRecord=也會刪除產生的銀行項目
@@ -135,8 +136,8 @@ BankTransactionLine=銀行項目
 AllAccounts=All bank and cash accounts
 BackToAccount=回到帳戶
 ShowAllAccounts=顯示所有帳戶
-FutureTransaction=未來的交易。沒有其他方式調節。
-SelectChequeTransactionAndGenerate="選擇/篩選器"檢查包含支票存款收據並點擊“建立”。
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=選擇要調節的銀行對帳單。使用可排序的數值： YYYYMM 或 YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=調節嗎？
@@ -153,7 +154,7 @@ RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=新的雜項付款
 VariousPayment=雜項付款
@@ -162,4 +163,6 @@ ShowVariousPayment=顯示雜項付款
 AddVariousPayment=新增雜項付款
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+BankAccountReleveModule=Module Bank statement
+AutoReportLastAccountStatement=Automatic report account stament
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 18341a60767..e7fb3205c2c 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -17,18 +17,18 @@ DisabledBecauseNotErasable=Disabled because cannot be erased
 InvoiceStandard=標準發票
 InvoiceStandardAsk=標準發票
 InvoiceStandardDesc=這是一種常見的發票。
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
+InvoiceDeposit=訂金發票
+InvoiceDepositAsk=訂金發票
 InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
 InvoiceProForma=形式發票
 InvoiceProFormaAsk=形式發票
 InvoiceProFormaDesc=<b>形式發票</b>是發票的形象，但沒有真實的會計價值。
 InvoiceReplacement=更換發票
 InvoiceReplacementAsk=更換發票的發票
-InvoiceReplacementDesc=<b>更換發票</b>僅用於取消或代替未付款項但已收貨的發票\n<br><br>注意:僅有未付款發票才可被更換。若被更換發票尚未被關閉，系統將自動'放棄'此發票。
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=貸方通知單
 InvoiceAvoirAsk=貸方通知單到正確發票
-InvoiceAvoirDesc=<b>貸方通知單</b>是一種負數發票，用來解決發票金額不同於實際支付之事實（範例：因為客戶因錯誤支付，或是他退回某些產品而不支付）。
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=返回款項
 DeletePayment=刪除付款
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=已收到的供應商付款單據清單
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=已收到的客戶付款單據清單
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=待驗證的客戶已付款單據
 PaymentsReportsForYear=報告s為%付款
 PaymentsReports=收支報告
@@ -91,8 +91,8 @@ PaymentConditionsShort=付款條件
 PaymentAmount=付款金額
 ValidatePayment=驗證付款
 PaymentHigherThanReminderToPay=付款支付更高的比提醒
-HelpPaymentHigherThanReminderToPay=註意，一個或更多的票據付款金額比其他支付更高。 <br>編輯您的進入，否則確認並考慮建立一個每個多繳發票收到超出信用註記。
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=分類'有償'
 ClassifyPaidPartially=分類薪部分'
 ClassifyCanceled=分類'已放棄'
@@ -131,7 +131,8 @@ BillStatusClosedUnpaid=關閉（無薪）
 BillStatusClosedPaidPartially=支付（部分）
 BillShortStatusDraft=草案
 BillShortStatusPaid=支付
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
 BillShortStatusConverted=已支付
 BillShortStatusCanceled=已放棄
 BillShortStatusValidated=驗證
@@ -141,16 +142,16 @@ BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=關閉
 BillShortStatusClosedPaidPartially=支付（部分）
 PaymentStatusToValidShort=為了驗證
-ErrorVATIntraNotConfigured=Intracommunautary增值稅數目尚未確定
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=沒有默認的支付方式定義。前往發票模塊設置，以解決這個問題。
 ErrorCreateBankAccount=創建一個銀行帳戶，然後到安裝發票模塊小組，確定付款方式
 ErrorBillNotFound=發票%s不存在
-ErrorInvoiceAlreadyReplaced=錯誤，您嘗試驗證發票發票%，以取代第但是，這一條已改為%s的發票
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=錯誤，已經使用優惠
 ErrorInvoiceAvoirMustBeNegative=錯誤的，正確的發票必須有一個負數
 ErrorInvoiceOfThisTypeMustBePositive=錯誤，這種類型的發票必須有一個正數
 ErrorCantCancelIfReplacementInvoiceNotValidated=錯誤，無法取消一個已經被另一個發票仍處於草案狀態取代發票
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=From
 BillTo=Bill To
 ActionsOnBill=行動對發票
@@ -179,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分退貨
 ConfirmClassifyPaidPartiallyReasonOther=其他原因而放棄金額
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=這個選擇是可能的，如果您的發票已提供適當的評論。 （例«只有相應的稅收已實際支付給權利扣除價格»）
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在一些國家，這種選擇是可能的，如果您的發票上只包含正確的說明。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=使用這個選擇，如果所有其他不適合
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>糟糕的客戶</b>是一個客戶，拒絕支付他的債務。
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=這個選擇是付款時使用的是不完整的，因為一些產品被退回
-ConfirmClassifyPaidPartiallyReasonOtherDesc=使用這個選擇，如果所有其他不適合，例如，在以下情況： <br> - 付款不完整，因為有些產品被運回<br> - 索賠額太重要了，因為忘記了一個折扣<br>在所有情況下，金額逾自稱必須在會計系統通過建立一個信用更正說明。
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=這一選擇將用於所有的其他情形。例如，因為你要創建一個替代發票。
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -200,9 +201,10 @@ ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=驗證發票
 UnvalidateBill=未驗證發票
-NumberOfBills=發票數
-NumberOfBillsByMonth=每月發票(invoice)數
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=發票金額
+AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=每月發票(invoice)金額（稅後）
 ShowSocialContribution=Show social/fiscal tax
 ShowBill=顯示發票
@@ -260,9 +262,9 @@ Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
 CreateRepeatableInvoice=Create template invoice
 CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=客戶發票和發票的路線
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
 CustomersInvoicesAndPayments=客戶發票和付款
-ExportDataset_invoice_1=客戶發票清單和發票的路線
+ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=客戶發票和付款
 ProformaBill=備考條例草案：
 Reduction=減少
@@ -302,9 +304,9 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=條例草案的報告
-HelpEscompte=這是給予客戶優惠折扣，因為它的任期作出之前付款。
-HelpAbandonBadCustomer=此金額已放棄（客戶說是一個壞的客戶），並作為一個特殊的松散考慮。
-HelpAbandonOther=這一數額已被放棄，因為這是一個錯誤（錯誤的顧客或由其他替代例如發票）
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=付款編號
 PaymentRef=Payment ref.
@@ -321,22 +323,22 @@ InvoiceNotChecked=選擇無發票
 CloneInvoice=克隆發票
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=行動禁用，因為發票已被取代
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
-NbOfPayments=鈮付款
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+NbOfPayments=No. of payments
 SplitDiscount=斯普利特折扣2
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
-TypeAmountOfEachNewDiscount=輸入金額為每兩部分：
-TotalOfTwoDiscountMustEqualsOriginal=兩個新的折扣總額必須等於原來折扣金額。
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=相關發票
 RelatedBills=有關發票
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
@@ -408,19 +410,19 @@ PaymentTypeCHQ=支票
 PaymentTypeShortCHQ=支票
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=在線支付
-PaymentTypeShortVAD=在線支付
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=草案
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=銀行的詳細資料
 BankCode=銀行代碼
-DeskCode=臺代碼
+DeskCode=Office code
 BankAccountNumber=帳號
-BankAccountNumberKey=關鍵
+BankAccountNumberKey=Check digits
 Residence=Direct debit
-IBANNumber=IBAN號碼
+IBANNumber=IBAN complete account number
 IBAN=銀行IBAN
 BIC=BIC號碼 / SWIFT號碼
 BICNumber=BIC號碼 / SWIFT號碼
@@ -445,7 +447,7 @@ PaymentByTransferOnThisBankAccount=付款至以下帳戶
 VATIsNotUsedForInvoice=* 不得包含VAT, 詳見CGI-293B
 LawApplicationPart1=通過對應用的12/05/80法80.335
 LawApplicationPart2=貨物仍然是財產
-LawApplicationPart3=賣方直到完全兌現
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=他們的價格。
 LimitedLiabilityCompanyCapital=SARL公司與資本
 UseLine=套用
@@ -463,7 +465,7 @@ Cheques=檢查
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=使用客戶帳單的連絡人地址，而不是作以合作方上地址作為發票收件人
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices
 ShowUnpaidAll=顯示所有未付款的發票
 ShowUnpaidLateOnly=只顯示遲遲未付款的發票
 PaymentInvoiceRef=%s的付款發票
@@ -474,21 +476,22 @@ Reported=延遲
 DisabledBecausePayments=不可能的，因為有一些付款
 CantRemovePaymentWithOneInvoicePaid=無法刪除，因為至少有付款發票分類所許
 ExpectedToPay=預期付款
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=氟離子選擇電極通過此付款
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=所有發票仍然沒有支付將被自動關閉狀態“支付最高”。
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=一個完整的PDF發票(invoice)文件範本（支援營業稅選項，折扣，付款條件..）
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -533,7 +536,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
@@ -546,3 +549,4 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=發票已刪除
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index eca3f4a92ac..a0d0704b6bc 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -30,5 +30,15 @@ ShowCompany=顯示公司
 ShowStock=顯示倉庫
 DeleteArticle=點擊刪除此文章
 FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=收銀機
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index c3f4c586b0d..337a9b9ff74 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -52,6 +52,7 @@ ActionAC_TEL=電話
 ActionAC_FAX=發送傳真
 ActionAC_PROP=通過郵件發送提案/建議書
 ActionAC_EMAIL=發送電子郵件
+ActionAC_EMAIL_IN=Reception of Email
 ActionAC_RDV=會議
 ActionAC_INT=Intervention on site
 ActionAC_FAC=通過郵件發送客戶發票
@@ -72,8 +73,8 @@ StatusProsp=潛在狀態
 DraftPropals=商業提案/建議書草稿
 NoLimit=無限制
 ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
+SignatureProposalRef=Signature of quote/commercial proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/zh_TW/dict.lang b/htdocs/langs/zh_TW/dict.lang
index 85310a761c9..25fa301a4bf 100644
--- a/htdocs/langs/zh_TW/dict.lang
+++ b/htdocs/langs/zh_TW/dict.lang
@@ -116,7 +116,7 @@ CountryHM=赫德島和麥當勞
 CountryVA=羅馬教廷（梵蒂岡城國）
 CountryHN=洪都拉斯
 CountryHK=香港
-CountryIS=Icelande
+CountryIS=Iceland
 CountryIN=印度
 CountryID=印度尼西亞
 CountryIR=伊朗
@@ -131,7 +131,7 @@ CountryKI=基裏巴斯
 CountryKP=北朝鮮
 CountryKR=韓國
 CountryKW=科威特
-CountryKG=Kyrghyztan
+CountryKG=Kyrgyzstan
 CountryLA=老撾
 CountryLV=拉脫維亞
 CountryLB=黎巴嫩
@@ -160,7 +160,7 @@ CountryMD=摩爾多瓦
 CountryMN=蒙古
 CountryMS=蒙特塞拉特
 CountryMZ=莫桑比克
-CountryMM=Birmania（緬甸）
+CountryMM=Myanmar (Burma)
 CountryNA=納米比亞
 CountryNR=瑙魯
 CountryNP=尼泊爾
@@ -223,7 +223,7 @@ CountryTO=湯加
 CountryTT=特裏尼達和多巴哥
 CountryTR=土耳其
 CountryTM=土庫曼斯坦
-CountryTC=特克斯群島和Cailos
+CountryTC=Turks and Caicos Islands
 CountryTV=圖瓦盧
 CountryUG=烏幹達
 CountryUA=烏克蘭
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=毛裏求斯盧比
 CurrencySingMUR=毛裏求斯盧比
 CurrencyNOK=挪威克朗
-CurrencySingNOK=挪威克朗
+CurrencySingNOK=Norwegian kronas
 CurrencyTND=突尼斯第納爾
 CurrencySingTND=突尼斯第納爾
 CurrencyUSD=美元
@@ -306,6 +306,7 @@ DemandReasonTypeSRC_WOM=口碑
 DemandReasonTypeSRC_PARTNER=夥伴
 DemandReasonTypeSRC_EMPLOYEE=員工
 DemandReasonTypeSRC_SPONSORING=贊助
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
 PaperFormatEU4A0=4A0 格式
 PaperFormatEU2A0=2A0 格式
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index fe14f4ebc96..9968512283c 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=鈮在目錄中的文檔
-ECMSection=目錄
-ECMSectionManual=手冊目錄
-ECMSectionAuto=自動目錄
-ECMSectionsManual=手冊樹
-ECMSectionsAuto=自動樹
-ECMSections=目錄
-ECMRoot=ECM Root
-ECMNewSection=新目錄
-ECMAddSection=添加手冊目錄
+ECMNbOfDocs=在資料夾中的文件數量
+ECMSection=資料夾
+ECMSectionManual=自行加入資料夾
+ECMSectionAuto=系統產生資料夾
+ECMSectionsManual=自行加入的樹狀圖
+ECMSectionsAuto=系統產生的樹狀圖
+ECMSections=各資料夾
+ECMRoot=電子控制管理的開始資料夾
+ECMNewSection=新資料夾
+ECMAddSection=新增資料夾
 ECMCreationDate=建立日期
-ECMNbOfFilesInDir=在目錄中的文件數
-ECMNbOfSubDir=數子目錄
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInDir=在資料夾中的檔案數量
+ECMNbOfSubDir=各子資料夾數量
+ECMNbOfFilesInSubDir=在各子資料夾的檔案數量
 ECMCreationUser=創造者
-ECMArea=DMS/ECM area
+ECMArea=檔案管理/電子控制管理區
 ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=*自動填寫目錄時自動加入一個元素從卡的文件。 <br> *手動目錄可以用來保存未鏈接到一個特定元素的文件。
 ECMSectionWasRemoved=目錄<b>%s</b>已被刪除。
@@ -34,6 +34,8 @@ ECMDocsByProjects=Documents linked to projects
 ECMDocsByUsers=Documents linked to users
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByHolidays=Documents linked to holidays
+ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=顯示目錄
 DeleteSection=刪除目錄
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index e99a62a48d0..7b97953995d 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -174,7 +174,7 @@ ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead/lead. So you must also enter its status
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter its status
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has occurred when saving the changes
@@ -212,7 +212,7 @@ ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on anothe
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-
+ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/zh_TW/help.lang b/htdocs/langs/zh_TW/help.lang
index ac22c7a46a7..a38115b05d7 100644
--- a/htdocs/langs/zh_TW/help.lang
+++ b/htdocs/langs/zh_TW/help.lang
@@ -5,9 +5,9 @@ RemoteControlSupport=網上實時/遠程支持
 OtherSupport=其他支持
 ToSeeListOfAvailableRessources=聯絡/查看可用的資源：
 HelpCenter=說明中心
-DolibarrHelpCenter=Dolibarr幫助和支持中心
-ToGoBackToDolibarr=否則，請點擊<a href="%s">這裏使用Dolibarr</a>
-TypeOfSupport=源支持
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
 TypeSupportCommunauty=社區（免費）
 TypeSupportCommercial=商業
 TypeOfHelp=說明類型
@@ -15,12 +15,9 @@ NeedHelpCenter=需要幫助或支援嗎？
 Efficiency=效率
 TypeHelpOnly=只需要說明
 TypeHelpDev=說明+開發
-TypeHelpDevForm=說明+開發+表格
-ToGetHelpGoOnSparkAngels1=有些公司可以提供快速（有時直接的），並采取更有效的在線控制您的計算機支持。這些傭工可以是<b>%s</b>網站上找到：
-ToGetHelpGoOnSparkAngels3=您還可以到所有可用的Dolibarr教練列表，點擊這個按鈕
-ToGetHelpGoOnSparkAngels2=有時，是目前公司沒有可供您進行搜尋，所以想改變篩選器，以尋找“所有的可用性”。您將能夠發送更多的請求。
-BackToHelpCenter=否則，請點擊這裏進入<a href="%s">返回幫助中心主頁</a> 。
-LinkToGoldMember=你可以調用由Dolibarr預選您的語言（%s的按一下他的小工具（狀態和最高價格自動更新））的教練之一：
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
 PossibleLanguages=支持的語言
-SubscribeToFoundation=幫助 Dolibarr 專案，訂閱基金會
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=用您的語言給 Dolibarr 官方支持：<br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index d76910503b5..7c3418d2f28 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=人資
-Holidays=休假
-CPTitreMenu=休假
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=新的請假單
-NotActiveModCP=您必須要啟用排休模組才能看到此頁面
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=提出假單
 DateDebCP=開始日期
 DateFinCP=結束日期
@@ -15,18 +15,18 @@ ApprovedCP=批準
 CancelCP=取消
 RefuseCP=拒絕
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
 LeaveId=Leave ID
 ReviewedByCP=Will be approved by
 UserForApprovalID=User for approval ID
-UserForApprovalFirstname=Firstname of approval user
-UserForApprovalLastname=Lastname of approval user
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login of approval user
 DescCP=描述
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -101,8 +101,8 @@ LEAVE_SICK=Sick leave
 LEAVE_OTHER=Other leave
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -112,7 +112,7 @@ NoticePeriod=通知期
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
 HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
 HolidaysValidated=Validated leave requests
 HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=Request denied
@@ -121,4 +121,9 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=到 <strong> 首頁 - 設定 - 各式分類 - 離職類型 </strong> 設定不同離職類型。 
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Holiday
+HolidaysNumberingModules=Leave requests numbering models
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 2aa83d6dc06..b7b3777594c 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -2,37 +2,37 @@
 InstallEasy=只需按照分步說明。
 MiscellaneousChecks=先決條件檢查
 ConfFileExists=配置文件<b>%s</b>存在。
-ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在，無法創建！
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=<b>%s的</b>配置文件可以被創建。
-ConfFileIsNotWritable=配置文件<b>%s</b>不是寫。檢查權限。對於第一次安裝，您的Web服務器必須被授予能夠進入這個文件寫在配置過程中（“文件模式，例如666”在一個像Unix的作業系統）。
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=配置文件<b>%s</b>是可寫的。
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=重新載入配置文件的所有信息。
+ConfFileReload=Reloading parameters from configuration file.
 PHPSupportSessions=這個PHP支持會議。
 PHPSupportPOSTGETOk=這個PHP支持的變量的POST和GET。
-PHPSupportPOSTGETKo=有可能你的PHP安裝程序不支持變量POST和/或GET。檢查你的php.ini中參數<b>的變數</b> 。
-PHPSupportGD=這個PHP支持廣東的圖形功能。
-PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=這個PHP支持UTF8的功能。
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportCurl=This PHP supports Curl.
+PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPMemoryOK=您的PHP最大會話內存設置為<b>%s。</b>這應該是足夠的。
-PHPMemoryTooLow=您的PHP最大會話內存設置為<b>%s</b>字節。這應該是太低了。改變你的<b>php.ini中</b>設置<b>memory_limit的</b>參數至少<b>%s</b>字節。
-Recheck=點擊這裏，更多的有意義的測試
-ErrorPHPDoesNotSupportSessions=您的PHP安裝不支持會話。此功能必須作出Dolibarr工作。檢查你的PHP安裝程序。
-ErrorPHPDoesNotSupportGD=您的PHP安裝不支持圖形功能的廣東。不圖將可用。
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=您的PHP安裝不支持UTF8的功能。 Dolibarr不能正常工作。解決這個安裝之前Dolibarr。
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorDirDoesNotExists=目錄%s不存在。
-ErrorGoBackAndCorrectParameters=後退和糾正錯誤的參數。
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=您可能輸入一個參數的錯誤值%s'的。
 ErrorFailedToCreateDatabase=無法創建數據庫'%s'的。
 ErrorFailedToConnectToDatabase=無法連接到數據庫'%s'的。
 ErrorDatabaseVersionTooLow=資料庫版本 (%s) 太舊. 需要至少版本 %s 或更新版本
 ErrorPHPVersionTooLow=PHP的版本太舊。版本%s是必需的。
-ErrorConnectedButDatabaseNotFound=連接到數據庫服務器的成功，但'%s'不存在。
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=數據庫'%s'已經存在。
-IfDatabaseNotExistsGoBackAndUncheckCreate=如果數據庫不存在，請返回並檢查選擇“創建數據庫”。
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=如果數據庫已經存在，請返回並取消選中“創建數據庫”選項。
-WarningBrowserTooOld=瀏覽器版本太舊. 建議使用Firefox,Chrome, Opera瀏覽器並升級到較新版本.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
 PHPVersion=PHP版本
 License=使用許可
 ConfigurationFile=配置文件
@@ -45,22 +45,23 @@ DolibarrDatabase=Dolibarr數據庫
 DatabaseType=數據庫類型
 DriverType=驅動類型
 Server=服務器
-ServerAddressDescription=名稱或IP數據庫服務器，通常填入'localhost'當數據庫服務器的地址存放在Web服務器相同的服務器比
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=數據庫服務器端口。保持空如果不明。
 DatabaseServer=數據庫服務器
 DatabaseName=數據庫名稱
-DatabasePrefix=數據庫前綴表
-AdminLogin=登錄為Dolibarr數據庫所有者。
-PasswordAgain=第二次再次輸入密碼
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
 AdminPassword=密碼Dolibarr數據庫所有者。
 CreateDatabase=創建數據庫
-CreateUser=Create owner or grant him permission on database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=數據庫服務器 - 超級用戶
-CheckToCreateDatabase=檢查中，如果數據庫不存在，必須創建。 <br>在這種情況下，必須填寫登錄/密碼為超級用戶帳戶在本頁面底部。
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-DatabaseRootLoginDescription=允許創建新的數據庫或新用戶，無用的，如果你的數據庫和數據庫登錄已經存在就像當你在一個網站舉辦的托管服務提供商是（用戶登錄）。
-KeepEmptyIfNoPassword=給空如果用戶沒有密碼（避免這種情況）
-SaveConfigurationFile=保存價值
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
 ServerConnection=服務器連接
 DatabaseCreation=數據庫的創建
 CreateDatabaseObjects=數據庫對象的創建
@@ -71,9 +72,9 @@ CreateOtherKeysForTable=創建外鍵和索引的表%s
 OtherKeysCreation=外鍵和索引創建
 FunctionsCreation=創造功能
 AdminAccountCreation=管理員登錄創作
-PleaseTypePassword=請鍵入一個密碼，空密碼不得！
-PleaseTypeALogin=請輸入登錄！
-PasswordsMismatch=密碼不同，請再試一次！
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
 SetupEnd=安裝完
 SystemIsInstalled=此安裝已完成。
 SystemIsUpgraded=Dolibarr已經升級成功。
@@ -81,65 +82,65 @@ YouNeedToPersonalizeSetup=您需要配置Dolibarr以滿足您的需求（外觀
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=前往Dolibarr
 GoToSetupArea=前往Dolibarr（安裝面積）
-MigrationNotFinished=您的數據庫的版本是不完全最新的，所以你必須再次運行升級過程。
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=轉到頁再次升級
 WithNoSlashAtTheEnd=沒有斜杠“/”在年底
-DirectoryRecommendation=這是推薦使用的目錄以外的你對你的網頁目錄。
+DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
 LoginAlreadyExists=已存在
 DolibarrAdminLogin=Dolibarr管理員登陸
-AdminLoginAlreadyExists=Dolibarr管理員帳戶<b>'%s'</b>已經存在。
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=警告，出於安全原因，一旦安裝或升級完成後，你應該刪除<b>安裝目錄或重命名為install.lock，以避免其惡意使用。</b>
-FunctionNotAvailableInThisPHP=不是可以用這個PHP
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=選擇遷移腳本
 DataMigration=Database migration (data)
 DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=腳本處理
 ChooseYourSetupMode=選擇你的安裝模式，然後點擊“開始”...
 FreshInstall=全新安裝
-FreshInstallDesc=使用此模式，如果這是你第一次安裝。如果沒有，這個模式可以不完全修復前安裝，但是如果你想升級你的版本，選擇“升級”模式。
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=升級
 UpgradeDesc=如果你使用這種模式已經取代了從一個較新版本的文件舊Dolibarr文件。這將提升您的數據庫和數據。
 Start=開始
 InstallNotAllowed=安裝程序不容許<b>conf.php</b>權限
 YouMustCreateWithPermission=您必須創建文件%s，並為網絡服務器在安裝過程中寫上它的權限。
-CorrectProblemAndReloadPage=請修正這個問題，請按F5重新載入頁面。
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
 AlreadyDone=已遷移
 DatabaseVersion=數據庫版本
 ServerVersion=數據庫服務器版本
 YouMustCreateItAndAllowServerToWrite=您必須創建此目錄和Web服務器允許寫進去。
 DBSortingCollation=字符排序
-YouAskDatabaseCreationSoDolibarrNeedToConnect=你問到創建數據庫<b>%s，</b>但對於這一點，Dolibarr需要連接到伺服器<b>%S</b>與超級用戶<b>%s</b>的權限。
-YouAskLoginCreationSoDolibarrNeedToConnect=你問到創建數據庫登錄<b>%s，</b>但是對於這一點，Dolibarr需要連接到伺服器<b>%S</b>與超級用戶<b>%s</b>的權限。
-BecauseConnectionFailedParametersMayBeWrong=作為連接失敗，主機或超級用戶參數一定是錯誤的。
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=孤兒付款檢測方法%s
 RemoveItManuallyAndPressF5ToContinue=手動刪除它，然後按F5鍵繼續。
 FieldRenamed=場更名
-IfLoginDoesNotExistsCheckCreateUser=如果登錄不存在，但你必須檢查選項“創建用戶”
-ErrorConnection=服務器<b>“%s”，</b>數據庫名稱<b>“%s”，</b>並登錄<b>“%的</b> ”，或數據庫密碼可能是錯誤或PHP的客戶端版本可能太舊版本相比，數據庫。
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
 InstallChoiceRecommanded=推薦選擇<b>你</b>的安裝版本<b>%%s</b>從當前版本
 InstallChoiceSuggested=<b>選擇安裝所建議的安裝程序</b> 。
-MigrateIsDoneStepByStep=目標版本（%s）有好幾個版本的差距，因此，安裝向導會回來一次將完成這一個建議未來的遷移。
-CheckThatDatabasenameIsCorrect=檢查數據庫名稱<b>“%s”</b>是正確的。
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
 IfAlreadyExistsCheckOption=如果此名稱是正確的，該數據庫尚不存在，你必須檢查選項“創建數據庫”。
 OpenBaseDir=PHP的openbasedir參數
-YouAskToCreateDatabaseSoRootRequired=你選中的方塊“創建數據庫”。為此，您需要提供登錄/密碼的超級用戶（形式的底部）。
-YouAskToCreateDatabaseUserSoRootRequired=你選中的方塊“創建數據庫所有者”。為此，您需要提供登錄/密碼的超級用戶（形式的底部）。
-NextStepMightLastALongTime=當前步驟可能會持續幾分鐘。請等待下一個屏幕顯示完全，然後再繼續。
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
 MigrationCustomerOrderShipping=客戶訂單出貨遷移存儲
 MigrationShippingDelivery=升級存儲航運
 MigrationShippingDelivery2=升級存儲航運2
 MigrationFinished=遷移完成
-LastStepDesc=<strong>最後一步</strong> ：此處定義的登錄名和密碼，您打算使用連接到軟件。不松，因為它是帳戶管理所有其他。
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=激活模塊%s
 ShowEditTechnicalParameters=點選這裡以顯示/編輯進階參數設定(專家模式)
-WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=您的資料庫版本是 %s. 如果您需要使用遷移程序進行資料庫結構的變更, 這個版本有嚴重錯誤使得資料遺失.因此, 直到您升級資料庫版本到較新的已解決版本(已知有問題的版本: %s),遷移程序將不會被允許執行.
-KeepDefaultValuesWamp=您使用從DoliWamp Dolibarr安裝向導，所以這裏建議值已經進行了優化。他們唯一的變化，如果你知道你做什麽。
-KeepDefaultValuesDeb=您使用從Ubuntu或者Debian軟件包的Dolibarr安裝向導，所以這裏建議值已經進行了優化。只有數據庫的所有者創建的密碼必須完成。其他參數的變化，如果你只知道你做什麽。
-KeepDefaultValuesMamp=您使用從DoliMamp Dolibarr安裝向導，所以這裏建議值已經進行了優化。他們唯一的變化，如果你知道你做什麽。
-KeepDefaultValuesProxmox=您使用Proxmox的虛擬設備的Dolibarr安裝向導，因此，這裏提出的價值已經優化。改變他們，只有當你知道你做什麽。
-UpgradeExternalModule=Run dedicated upgrade process of external modules
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
@@ -151,7 +152,7 @@ MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=商業提案/建議書的資料移轉
 MigrationInvoice=數據遷移的客戶的發票
 MigrationContract=數據遷移合同
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=升級成功
 MigrationUpdateFailed=升級過程中失敗
 MigrationRelationshipTables=數據遷移的關系表（%s）的
 MigrationPaymentsUpdate=支付數據校正
@@ -163,9 +164,9 @@ MigrationContractsUpdate=合同數據校正
 MigrationContractsNumberToUpdate=%的合同（縣）更新
 MigrationContractsLineCreation=創建合同號線中1%的合同
 MigrationContractsNothingToUpdate=沒有更多的事情要做
-MigrationContractsFieldDontExist=場fk_facture不存在了。無事可做。
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=合同空日期更正
-MigrationContractsEmptyDatesUpdateSuccess=合約空白日期成功地更正完成
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=沒有合同的日期，以正確的空
 MigrationContractsEmptyCreationDatesNothingToUpdate=沒有合同，以正確的創建日期
 MigrationContractsInvalidDatesUpdate=合同日期更正錯誤的價值
@@ -187,24 +188,25 @@ MigrationDeliveryDetail=送貨更新
 MigrationStockDetail=更新產品的股票價值
 MigrationMenusDetail=最新動態菜單表
 MigrationDeliveryAddress=在貨物的配送地址更新
-MigrationProjectTaskActors=數據llx_projet_task_actors遷移表
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=數據遷移llx_projet領域fk_user_resp到llx_element_contact
 MigrationProjectTaskTime=更新時間花費在幾秒鐘內
 MigrationActioncommElement=在行動上的更新數據
 MigrationPaymentMode=付款方式的數據遷移
 MigrationCategorieAssociation=目錄遷移
-MigrationEvents=事件遷移正進行新增事件負責人到指定的表格
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=顯示不可用的選項
-HideNotAvailableOptions= 隱藏不可用的選項
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
-YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file <strong>install.lock</strong> into dolibarr documents directory).<br>
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index b53d1c3b890..6206d945598 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -437,6 +437,7 @@ ContactsForCompany=此合作方的通訊錄
 ContactsAddressesForCompany=此合作方的通訊錄及地址
 AddressesForCompany=此合作方的地址
 ActionsOnCompany=此合作方的各種事件
+ActionsOnContact=Events about this contact/address
 ActionsOnMember=此會員的各種事件
 ActionsOnProduct=此產品的各種事件
 NActionsLate=%s的後期
@@ -847,9 +848,9 @@ ModuleBuilder=模組建立者
 SetMultiCurrencyCode=設定幣別
 BulkActions=大量動作
 ClickToShowHelp=點一下顯示工具提示
-WebSite=網站
-WebSites=各式網站
-WebSiteAccounts=網站帳號
+WebSite=Website
+WebSites=網站
+WebSiteAccounts=Website accounts
 ExpenseReport=費用報表
 ExpenseReports=費用報表
 HR=人資
@@ -953,3 +954,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=透過連線分享檔案
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=庫存
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index bc1dd0d4d47..5a8219c5986 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -83,6 +83,7 @@ LinkedObject=鏈接對象
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -260,5 +261,7 @@ WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=標題
 WEBSITE_DESCRIPTION=廠商品號/品名/商品描述
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a preview of a list of blog posts).
 WEBSITE_KEYWORDS=Keywords
 LinesToImport=Lines to import
diff --git a/htdocs/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang
index 2a58d969488..f2b92bd4087 100644
--- a/htdocs/langs/zh_TW/paybox.lang
+++ b/htdocs/langs/zh_TW/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox模塊設置
 PayBoxDesc=該模塊提供的網頁，以便在付款<a href="http://www.paybox.com" target="_blank">Paybox</a>客戶。這可以用來為一個自由付款或就某一Dolibarr對象（發票，訂貨，付款...）
 FollowingUrlAreAvailableToMakePayments=以下網址可提供給客戶的網頁上，能夠作出Dolibarr支付對象
 PaymentForm=付款方式
-WelcomeOnPaymentPage=歡迎您來到我們的在線支付服務
+WelcomeOnPaymentPage=Welcome to our online payment service
 ThisScreenAllowsYouToPay=這個屏幕允許你進行網上支付%s。
 ThisIsInformationOnPayment=這是在做付款信息
 ToComplete=要完成
@@ -20,10 +20,11 @@ ToOfferALinkForOnlinePaymentOnInvoice=網址提供發票一%s在線支付的用
 ToOfferALinkForOnlinePaymentOnContractLine=網址提供了一個合同線%s在線支付的用戶界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=網址提供一個免費的網上支付金額%s用戶界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=網址為會員提供訂閱%s在線支付的用戶界面
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment user interface for payment of donation
 YouCanAddTagOnUrl=您還可以添加<b>標簽=</b> url參數<b>及<i>價值</i></b>的任何網址（只需要支付免費）添加自己的註釋標記付款。
-SetupPayBoxToHavePaymentCreatedAutomatically=設置您的<b>%s</b> PayBox與網址有paybox付款時自動創建的驗證。
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=本頁面確認您的付款已記錄。謝謝。
-YourPaymentHasNotBeenRecorded=您的付款並沒有被記錄和交易已取消。謝謝。
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
 AccountParameter=帳戶參數
 UsageParameter=使用參數
 InformationToFindParameters=幫助，找到你的%s帳戶信息
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index 03aab775251..fd50b254c8f 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=簽名（需要收費）
 PropalStatusNotSigned=不簽署（非公開）
 PropalStatusBilled=帳單
 PropalStatusDraftShort=草案
-PropalStatusValidatedShort=驗證
+PropalStatusValidatedShort=Validated (open)
 PropalStatusClosedShort=關閉
 PropalStatusSignedShort=簽名
 PropalStatusNotSignedShort=未簽署
@@ -53,9 +53,9 @@ ErrorPropalNotFound=Propal%s不符合
 AddToDraftProposals=增加提案/建議書草稿
 NoDraftProposals=沒有提案/建議書草稿
 CopyPropalFrom=利用現有的商業提案/建議書建立商業提案/建議書
-CreateEmptyPropal=從產品/服務清單或空白建立提案/建議書
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
 DefaultProposalDurationValidity=預設的商業提案/建議書有效期（天數）
-UseCustomerContactAsPropalRecipientIfExist=使用客戶連絡人地址（如果已定義）而非合作方地址作為提案/建議書收件人地址
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
 ClonePropal=完整複製商業提案/建議書
 ConfirmClonePropal=您確定您要完整複製商業提案/建議書<b>%s</b>？
 ConfirmReOpenProp=您確定要打開商業提案/建議書<b>%s</b>嗎？
@@ -78,6 +78,7 @@ TypeContact_propal_external_CUSTOMER=後續提案/建議書的客戶連絡人
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
 DocModelAzurDescription=一個完整的提案/建議書模型（logo. ..）
+DocModelCyanDescription=一個完整的提案/建議書模型（logo. ..）
 DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=當結束企業提案/建議書時使用預設範本(開立發票)
 DefaultModelPropalClosed=當結束企業提案/建議書時使用預設範本(尚未計價)
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 7bbcf5348b2..18b7f659750 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -1,33 +1,36 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=碼
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Website .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
 PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -36,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=閱讀
 WritePerm=Write
@@ -45,26 +48,28 @@ PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
-SiteAdded=Web site added
+SiteAdded=Website added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
 ParentPageId=Parent page ID
 WebsiteId=Website ID
 CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create empty page from scratch...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
 FetchAndCreate=Fetch and Create
-ExportSite=Export site
+ExportSite=Export website
+ImportSite=Import website template
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +78,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Website editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.<br>Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -82,3 +87,9 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package
+ShowSubcontainers=Include dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index e47ce27009d..6c0c79f7689 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -109,7 +109,7 @@ $langs->loadLangs(array("main", "bills", "cashdesk"));
 <button type="button" class="calcbutton" onclick="addreceived(0.10);">0.10</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.20);">0.20</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.50);">0.50</button>
-<button type="button" class="calcbutton2" onclick="Validate('cheque');"><?php echo $langs->trans("Cheque"); ?></button>
+<button type="button" <?php if ($placeid==0) echo "disabled";?> class="calcbutton2" onclick="Validate('cheque');"><?php echo $langs->trans("Cheque"); ?></button>
 <button type="button" class="calcbutton" onclick="addreceived(0.01);">0.01</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.02);">0.02</button>
 <button type="button" class="calcbutton" onclick="addreceived(0.05);">0.05</button>
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index fd6234268b2..b4aed9f7844 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -449,14 +449,14 @@ if (empty($reshook)) {
 
 				if (!$error && !count($object->errors)) {
 					if (GETPOST('deletephoto') && $object->photo) {
-						$fileimg = $conf->user->dir_output.'/'.get_exdir($object->id, 2, 0, 1, $object, 'user').'/logos/'.$object->photo;
-						$dirthumbs = $conf->user->dir_output.'/'.get_exdir($object->id, 2, 0, 1, $object, 'user').'/logos/thumbs';
+						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/'.$object->photo;
+						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/thumbs';
 						dol_delete_file($fileimg);
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
 					if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name'])) {
-						$dir = $conf->user->dir_output.'/'.get_exdir($object->id, 2, 0, 1, $object, 'user');
+						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
 
 						dol_mkdir($dir);
 
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index e8e04b641a3..26231534f67 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1067,6 +1067,10 @@ class Website extends CommonObject
 			}
 		}
 
+		// Regenerate index page to point to new index page
+		$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
+		dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php');
+
 		if ($error)
 		{
 			$this->db->rollback();